From e68d67031ef224da375c0473d2f44902623acb0f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 24 Mar 2006 16:07:54 +0100
Subject: * merge with the stuff from the update-manager--mvo branch

---
 DistUpgrade/DistUpgrade.glade       |  4 ++--
 DistUpgrade/DistUpgradeCache.py     |  1 +
 DistUpgrade/DistUpgradeControler.py | 16 ++++++++------
 DistUpgrade/DistUpgradeViewGtk.py   | 21 ++++++++++++------
 DistUpgrade/TODO                    |  5 -----
 DistUpgrade/build-dist.sh           | 43 +++++++++++++++++++++++++++++++++++++
 6 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100755 DistUpgrade/build-dist.sh

diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index e50476e2..08b96a11 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -520,7 +520,7 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="button_cancel">
+	    <widget class="GtkButton" id="button_cancel_changes">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -533,7 +533,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="button_start">
+	    <widget class="GtkButton" id="button_confirm_changes">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index 1711ef1b..2adab2ad 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -157,6 +157,7 @@ class MyCache(apt.Cache):
             origins = pkg.candidateOrigin
             trusted = False
             for origin in origins:
+                #print origin
                 trusted |= origin.trusted
             if not trusted:
                 untrusted.append(pkg.name)
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 6dcc0e2a..972ea2dc 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -157,7 +157,7 @@ class DistUpgradeControler(object):
         # FIXME: retry here too? just like the DoDistUpgrade?
         #        also remove all files from the lists partial dir!
         currentRetry = 0
-        maxRetries = self.config.get("Network","MaxRetries")
+        maxRetries = int(self.config.get("Network","MaxRetries"))
         while currentRetry < maxRetries:
             try:
                 res = self.cache.update(progress)
@@ -183,7 +183,7 @@ class DistUpgradeControler(object):
         # log the changes for debuging
         self._logChanges()
         # ask the user if he wants to do the changes
-        archivedir = apt_pkg.Config.FindDir("Dir::Cache::archives ")
+        archivedir = apt_pkg.Config.FindDir("Dir::Cache::archives")
         st = os.statvfs(archivedir)
         free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE]
         if self.cache.requiredDownload > free:
@@ -205,7 +205,7 @@ class DistUpgradeControler(object):
         fprogress = self._view.getFetchProgress()
         iprogress = self._view.getInstallProgress()
         # retry the fetching in case of errors
-        maxRetries = self.config.get("Network","MaxRetries")
+        maxRetries = int(self.config.get("Network","MaxRetries"))
         while currentRetry < maxRetries:
             try:
                 res = self.cache.commit(fprogress,iprogress)
@@ -270,9 +270,12 @@ class DistUpgradeControler(object):
         # get changes
         changes = self.cache.getChanges()
         logging.debug("The following packages are remove candidates: %s" % " ".join([pkg.name for pkg in changes]))
+        summary = _("Remove obsolete packages?")
+        actions = [_("_Skip This Step"), _("_Remove")]
+        # FIXME Add an explanation about what obsolete pacages are
+        #explanation = _("")
         if len(changes) > 0 and \
-               self._view.confirmChanges(_("Remove obsolete Packages?"),
-                                         changes, 0):
+               self._view.confirmChanges(summary, changes, 0, actions):
             fprogress = self._view.getFetchProgress()
             iprogress = self._view.getInstallProgress()
             try:
@@ -301,7 +304,8 @@ class DistUpgradeControler(object):
             abort(1)
 
         # run a "apt-get update" now
-        self.doUpdate()
+        if not self.doUpdate():
+            self.abort()
 
         # do pre-upgrade stuff (calc list of obsolete pkgs etc)
         self.doPreUpdate()
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 2f7e3fed..a6847cc7 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -132,7 +132,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         # FIXME: add support for the timeout
         # of the terminal (to display something useful then)
         # -> longer term, move this code into python-apt 
-        self.label_status.set_text(_("Installing updates"))
+        self.label_status.set_text(_("Applying changes"))
         self.progress.set_fraction(0.0)
         self.progress.set_text(" ")
         self.expander.set_sensitive(True)
@@ -163,6 +163,10 @@ class GtkInstallProgressAdapter(InstallProgress):
         pid = self.term.forkpty(envv=self.env)
         return pid
 
+    def statusChange(self, pkg, percent, status):
+        self.progress.set_fraction(float(percent)/100.0)
+        self.label_status.set_text(status.strip())
+
     def child_exited(self, term, pid, status):
         self.apt_status = os.WEXITSTATUS(status)
         self.finished = True
@@ -177,8 +181,6 @@ class GtkInstallProgressAdapter(InstallProgress):
     
     def updateInterface(self):
         InstallProgress.updateInterface(self)
-        self.progress.set_fraction(self.percent/100.0)
-        self.label_status.set_text(self.status)
         while gtk.events_pending():
             gtk.main_iteration()
 	time.sleep(0.02)
@@ -217,7 +219,6 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
         attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1)
         attrlist.insert(attr)
         self.label_status.set_property("attributes", attrlist)
-
         # reasonable fault handler
         sys.excepthook = self._handleException
 
@@ -298,7 +299,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
         self.dialog_error.destroy()
         return False
 
-    def confirmChanges(self, summary, changes, downloadSize):
+    def confirmChanges(self, summary, changes, downloadSize, actions=None):
         # FIXME: add a whitelist here for packages that we expect to be
         # removed (how to calc this automatically?)
         DistUpgradeView.confirmChanges(self, summary, changes, downloadSize)
@@ -345,6 +346,12 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
             self.error(summary, msg)
             return False
 
+        if actions != None:
+            self.button_cancel_changes.set_use_stock(False)
+            self.button_cancel_changes.set_use_underline(True)
+            self.button_cancel_changes.set_label(actions[0])
+            self.button_confirm_changes.set_label(actions[1])
+
         self.label_summary.set_markup("<big><b>%s</b></big>" % summary)
         self.label_changes.set_markup(msg)
         # fill in the details
@@ -355,6 +362,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
             self.details_list.append([_("Install %s" % inst)])
         for up in self.toUpgrade:
             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()
         self.dialog_changes.window.set_functions(gtk.gdk.FUNC_MOVE)
@@ -400,7 +408,7 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
         return True
 
 if __name__ == "__main__":
-  view = GtkDistUpgradeView()
+  view = DistUpgradeViewGtk()
   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"
@@ -410,3 +418,4 @@ if __name__ == "__main__":
              "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)
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index fb6895f9..04c507be 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -19,11 +19,6 @@ hoary->breezy
   (it will crash otherwise)
 - send a "\n" on the libc6 question on hoary->breezy
 
-breezy->dapper
---------------
-- gnome-icon-theme changes a lot, icons move from hicolor to gnome.
-  this might have caused a specatular crash during a upgrade
-
 general
 -------
 - CDROM upgrades !!!
diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh
new file mode 100755
index 00000000..f18dc2ce
--- /dev/null
+++ b/DistUpgrade/build-dist.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# build a tarball that is ready for the upload. the format is 
+# simple, it contans:
+#   $version/$dist.tar.gz 
+#   $version/ReleaseNotes 
+# this put into a file called "$dist-upgrader_$version.tar.gz"       
+
+
+TARGETDIR=../dist-upgrade-build
+SOURCEDIR=`pwd`
+DIST=dapper
+NOTES=ReleaseAnouncement
+version=$(date +%Y%m%d.%H%M)
+
+# create targetdir
+if [ ! -d $TARGETDIR/$version ]; then
+	mkdir -p $TARGETDIR/$version
+fi
+
+#build the actual dist-upgrader tarball
+./build-tarball.sh
+
+# how move it into a container including the targetdir (with version)
+# and ReleaeNotes
+cd $TARGETDIR/$version
+cp $SOURCEDIR/$NOTES .
+cp $SOURCEDIR/$DIST.tar.gz .
+cd ..
+
+# build it
+TARBALL="dist-upgrader_"$version"_all.tar.gz"
+tar czvf $TARBALL $version
+
+# now create a changes file
+CHANGES="dist-upgrader_$version.changes"
+echo "Format: 1.7" > $CHANGES
+echo "Date: `date -R`" >> $CHANGES
+echo "Architecture: all">>$CHANGES
+echo "Version: $version" >>$CHANGES
+echo "Distribution: dapper"  >>$CHANGES
+echo "Files: " >> $CHANGES
+echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader $TARBALL" >> $CHANGES
-- 
cgit v1.2.3


From 2592b1a3ce1da07de5bd40798be04d60879a8a69 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 27 Mar 2006 14:55:05 +0200
Subject: * a decent conffile dialog added

---
 DistUpgrade/DistUpgrade.glade     | 342 ++++++++++++++++++++++++++++++++++++++
 DistUpgrade/DistUpgradeViewGtk.py |  34 +++-
 DistUpgrade/TODO                  |   3 +-
 3 files changed, 376 insertions(+), 3 deletions(-)

diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index 08b96a11..8d82b7c5 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -1441,4 +1441,346 @@ The system could be in an unusable state if you cancel the upgrade. You are stro
   </child>
 </widget>
 
+<widget class="GtkDialog" id="dialog_conffile">
+  <property name="border_width">5</property>
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">True</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">False</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="vbox12">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">12</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="hbuttonbox6">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="button9">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="has_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-9</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment2">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox13">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
+
+		      <child>
+			<widget class="GtkImage" id="image10">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-cancel</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label30">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Keep</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button10">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-8</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment3">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox14">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
+
+		      <child>
+			<widget class="GtkImage" id="image11">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-ok</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label31">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Replace</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHBox" id="hbox15">
+	  <property name="border_width">6</property>
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">12</property>
+
+	  <child>
+	    <widget class="GtkImage" id="image12">
+	      <property name="visible">True</property>
+	      <property name="stock">gtk-dialog-question</property>
+	      <property name="icon_size">6</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox13">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">12</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label_conffile">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">True</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkExpander" id="expander3">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="expanded">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox14">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkScrolledWindow" id="scrolledwindow5">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkTextView" id="textview_conffile">
+		      <property name="height_request">300</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="editable">False</property>
+		      <property name="overwrite">False</property>
+		      <property name="accepts_tab">True</property>
+		      <property name="justification">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap_mode">GTK_WRAP_NONE</property>
+		      <property name="cursor_visible">False</property>
+		      <property name="pixels_above_lines">0</property>
+		      <property name="pixels_below_lines">0</property>
+		      <property name="pixels_inside_wrap">0</property>
+		      <property name="left_margin">0</property>
+		      <property name="right_margin">0</property>
+		      <property name="indent">0</property>
+		      <property name="text" translatable="yes"></property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label33">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Difference between the files</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">label_item</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index a6847cc7..1e1edc67 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -30,6 +30,7 @@ import pango
 import sys
 import logging
 import time
+import subprocess
 
 import apt
 import apt_pkg
@@ -158,7 +159,31 @@ class GtkInstallProgressAdapter(InstallProgress):
 
     def conffile(self, current, new):
         logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current)
-        self.expander.set_expanded(True)
+        #self.expander.set_expanded(True)
+        prim = _("Replace configuration file\n'%s'?" % current)
+        sec = ("The configuration file %s was modified (by "
+               "you or by a script). An updated version is shipped "
+               "in this package. If you want to keep your current "
+               "version say 'Keep'. Do you want to replace the "
+               "current file and install the new package "
+               "maintainers version? " % current)
+        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)
+
+        # now get the diff
+        cmd = ["/usr/bin/diff", "-u", current, new]
+        diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0])
+        self.parent.textview_conffile.get_buffer().set_text(diff)
+        res = self.parent.dialog_conffile.run()
+        self.parent.dialog_conffile.hide()
+        # if replace, send this to the terminal
+        if res == gtk.RESPONSE_YES:
+          self.term.feed_child("y\n")
+        else:
+          self.term.feed_child("n\n")
+        
+        
     def fork(self):
         pid = self.term.forkpty(envv=self.env)
         return pid
@@ -408,7 +433,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
         return True
 
 if __name__ == "__main__":
+  
   view = DistUpgradeViewGtk()
+  ip = GtkInstallProgressAdapter(view)
+  ip.conffile("TODO","TODO~")
+
   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"
@@ -418,4 +447,5 @@ if __name__ == "__main__":
              "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)
+  #view.confirmChanges("xx",[], 100)
+  
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index 04c507be..217eb6cb 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -1,10 +1,11 @@
 MUSTFIX:
 --------
 * debconf gnome dosn't work (can't connect to the session)
+  [ should be fixed with the bugfix on gksu ]
 * display a message that all applications should be closed for the 
   dist-upgrade (and that strange things like a crashing panel can
   happen)
-
+  [done in current dialog]
 
 
 breezy->dapper
-- 
cgit v1.2.3


From 376af57686222fcddc489ca6a6088b6a23ec1ca1 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 27 Mar 2006 15:22:54 +0200
Subject: * if apt fails, try to recover with "dpkg --configure -a"

---
 DistUpgrade/DistUpgradeControler.py |  7 ++++---
 DistUpgrade/DistUpgradeView.py      |  8 ++++++++
 DistUpgrade/DistUpgradeViewGtk.py   | 21 ++++++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 972ea2dc..874eaf0b 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -213,9 +213,10 @@ class DistUpgradeControler(object):
                 # installing the packages failed, can't be retried
                 self._view.error(_("Could not install the upgrades"),
                                  _("The upgrade aborts now. Your system "
-                                   "can be in an unusable state. Please "
-                                   "try 'sudo apt-get install -f' or Synaptic "
-                                   "to fix your system."), "%s" % e)
+                                   "can be in an unusable state. A recovery "
+                                   "is now run (dpkg --configure -a)."),
+                                 "%s" % e)
+                self._view.getTerminal().call(["dpkg","--configure","-a"])
                 return False
             except IOError, e:
                 # fetch failed, will be retried
diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index 8e9a3d3f..02894939 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -19,6 +19,12 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+class DumbTerminal(object):
+    def run(self, cmd):
+        " expects a command in the subprocess style (as a list) "
+        subprocess.call(cmd)
+        
+
 class DistUpgradeView(object):
     " abstraction for the upgrade view "
     def __init__(self):
@@ -32,6 +38,8 @@ class DistUpgradeView(object):
     def getInstallProgress(self):
         " return a install progress object "
         return apt.progress.InstallProgress()
+    def getTerminal(self):
+        return DumbTerminal()
     def updateStatus(self, msg):
         """ update the current status of the distUpgrade based
             on the current view
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 1e1edc67..b095478c 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -210,6 +210,14 @@ class GtkInstallProgressAdapter(InstallProgress):
             gtk.main_iteration()
 	time.sleep(0.02)
 
+class DistUpgradeVteTerminal(object):
+  def __init__(self, parent, term):
+    self.term = term
+    self.parent = parent
+  def call(self, cmd):
+    self.term.show()
+    self.parent.expander_terminal.set_expanded(True)
+    self.term.fork_command(command=cmd[0],argv=cmd)
 
 class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
     " gtk frontend of the distUpgrade tool "
@@ -258,13 +266,20 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
                  "\n".join(lines))
       sys.exit(1)
 
+    def getTerminal(self):
+        return DistUpgradeVteTerminal(self, self._term)
+
     def create_terminal(self, arg1,arg2,arg3,arg4):
         " helper to create a vte terminal "
         self._term = vte.Terminal()
         self._term.set_font_from_string("monospace 10")
         self._term.connect("contents-changed", self._term_content_changed)
         self._terminal_lines = []
-        self._terminal_log = open("/var/log/dist-upgrade-term.log","w")
+        try:
+          self._terminal_log = open("/var/log/dist-upgrade-term.log","w")
+        except IOError:
+          # if something goes wrong (permission denied etc), use stdout
+          self._terminal_log = sys.stdout
         return self._term
 
     def _term_content_changed(self, term):
@@ -437,7 +452,8 @@ if __name__ == "__main__":
   view = DistUpgradeViewGtk()
   ip = GtkInstallProgressAdapter(view)
   ip.conffile("TODO","TODO~")
-
+  view.getTerminal().call(["dpkg","--configure","-a"])
+  #view.getTerminal().call(["ls"])
   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"
@@ -448,4 +464,3 @@ if __name__ == "__main__":
              "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
              )
   #view.confirmChanges("xx",[], 100)
-  
-- 
cgit v1.2.3


From a079d751f0c9e117eedf4d0bbc6d24b06f4baf46 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 27 Mar 2006 16:40:19 +0200
Subject: * po/*.po: make update-po * DistUpgrade/build-dist.sh: write out a
 proper changes file

---
 DistUpgrade/build-dist.sh |  18 ++-
 po/bg.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/da.po                  | 252 +++++++++++++++++++++++----------------
 po/de.po                  | 288 +++++++++++++++++++++++++++------------------
 po/el.po                  | 263 ++++++++++++++++++++++++-----------------
 po/en_CA.po               | 285 ++++++++++++++++++++++++++------------------
 po/en_GB.po               | 285 ++++++++++++++++++++++++++------------------
 po/es.po                  | 285 ++++++++++++++++++++++++++------------------
 po/fi.po                  | 282 ++++++++++++++++++++++++++------------------
 po/fr.po                  | 285 ++++++++++++++++++++++++++------------------
 po/gl.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/he.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/hu.po                  | 285 ++++++++++++++++++++++++++------------------
 po/it.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/ja.po                  | 285 ++++++++++++++++++++++++++------------------
 po/lt.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/mk.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/nb.po                  | 285 ++++++++++++++++++++++++++------------------
 po/ne.po                  | 285 ++++++++++++++++++++++++++------------------
 po/nl.po                  | 254 +++++++++++++++++++++++----------------
 po/no.po                  | 285 ++++++++++++++++++++++++++------------------
 po/pa.po                  | 269 +++++++++++++++++++++++++-----------------
 po/pl.po                  | 285 ++++++++++++++++++++++++++------------------
 po/pt.po                  | 282 +++++++++++++++++++++++++++-----------------
 po/pt_BR.po               | 287 ++++++++++++++++++++++++++------------------
 po/ro.po                  | 279 +++++++++++++++++++++++++------------------
 po/rw.po                  | 288 ++++++++++++++++++++++++++-------------------
 po/sv.po                  | 294 +++++++++++++++++++++++++++-------------------
 po/uk.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/update-manager.pot     | 254 +++++++++++++++++++++++----------------
 po/vi.po                  | 291 ++++++++++++++++++++++++++-------------------
 po/xh.po                  | 264 ++++++++++++++++++++++++-----------------
 po/zh_CN.po               | 282 ++++++++++++++++++++++++++------------------
 po/zh_HK.po               | 291 ++++++++++++++++++++++++++-------------------
 po/zh_TW.po               | 291 ++++++++++++++++++++++++++-------------------
 35 files changed, 5756 insertions(+), 3860 deletions(-)

diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh
index f18dc2ce..f48c4e39 100755
--- a/DistUpgrade/build-dist.sh
+++ b/DistUpgrade/build-dist.sh
@@ -10,6 +10,7 @@
 TARGETDIR=../dist-upgrade-build
 SOURCEDIR=`pwd`
 DIST=dapper
+MAINTAINER="Michael Vogt <michael.vogt@ubuntu.com>"
 NOTES=ReleaseAnouncement
 version=$(date +%Y%m%d.%H%M)
 
@@ -33,11 +34,20 @@ TARBALL="dist-upgrader_"$version"_all.tar.gz"
 tar czvf $TARBALL $version
 
 # now create a changes file
-CHANGES="dist-upgrader_$version.changes"
-echo "Format: 1.7" > $CHANGES
+CHANGES="dist-upgrader_"$version"_all.changes"
+echo > $CHANGES
+echo "Origin: Ubuntu/$DIST" >> $CHANGES 
+echo "Format: 1.7" >> $CHANGES
 echo "Date: `date -R`" >> $CHANGES
 echo "Architecture: all">>$CHANGES
 echo "Version: $version" >>$CHANGES
-echo "Distribution: dapper"  >>$CHANGES
+echo "Distribution: $DIST"  >>$CHANGES
+echo "Source: dist-upgrader" >> $CHANGES
+echo "Binary: dist-upgrader" >> $CHANGES
+echo "Urgency: low" >> $CHANGES
+echo "Maintainer: $MAINTAINER" >> $CHANGES
+echo "Changed-By: $MAINTAINER" >> $CHANGES
+echo "Changes: "  >> $CHANGES
+echo " * new upstream version"  >> $CHANGES 
 echo "Files: " >> $CHANGES
-echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader $TARBALL" >> $CHANGES
+echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader - $TARBALL" >> $CHANGES
diff --git a/po/bg.po b/po/bg.po
index dcab8148..5adf6549 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-07-22 19:24+0300\n"
 "Last-Translator: Rostislav \"zbrox\" Raykov <zbrox@i-space.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -17,39 +17,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Грешка при внасяне на избрания файл"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Избраният файл или не е GPG файл или е повреден."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Грешка при премахване на ключа"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
 "грешка."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -57,11 +57,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -98,23 +98,23 @@ msgstr ""
 "грешка."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -124,11 +124,11 @@ msgstr ""
 "грешка."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -196,29 +196,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -226,54 +234,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Друга програма за управление на пакетите е стартирана."
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Обновлението е завършено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -281,97 +289,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Инсталиране на обновленията..."
+msgid "Applying changes"
+msgstr "Сваляне на промените..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
 "грешка."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Ключове</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Инсталиране"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Обновлението е завършено"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -417,45 +433,57 @@ msgid "Details"
 msgstr "<b>Допълнителна информация</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Презареждане"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -482,58 +510,61 @@ msgid "Changes"
 msgstr "Промени"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Описание"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Проверка за обновления..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Презареждане от сървъра на информацията за пакетите."
+msgid "Description"
+msgstr "Описание"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Обновления на софтуера"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Инсталиране на обновленията..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Презареждане"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -601,7 +632,7 @@ msgid "_Check for updates automatically:"
 msgstr "Проверка за обновления на всеки"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -613,36 +644,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Ключове</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Компоненти</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Дистрибуция:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Раздели:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Раздели:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Вид:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -658,15 +700,15 @@ msgstr ""
 "Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете "
 "подробно описание на синтаксиса в документацията."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Ред за APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -674,22 +716,27 @@ msgstr ""
 "Двоични\n"
 "Изходен код"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Лично"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Презареждане"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -736,25 +783,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 обновления"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 обновления по сигурността"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 обновления"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 обновления"
 
 #. Description
@@ -780,9 +827,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 обновления"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Официално поддържан"
 
 #. CompDescription
@@ -839,6 +886,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Официално поддържан"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -849,6 +902,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Инсталиране на обновленията..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Презареждане от сървъра на информацията за пакетите."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Раздели:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Обновления на софтуера"
@@ -885,9 +949,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ден/дни"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненти</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Хранилище</b>"
 
@@ -1070,9 +1131,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Версия %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Сваляне на промените..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Няма пакети за обновяване"
 
@@ -1105,9 +1163,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Обновяване на списъка с пакетите..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Проверка за обновления..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Няма налични обновления."
 
diff --git a/po/da.po b/po/da.po
index ff181403..d984ffc1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,34 +1,34 @@
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -36,11 +36,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -74,34 +74,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -168,29 +168,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -198,52 +206,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -251,93 +259,101 @@ 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:135
-msgid "Installing updates"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -382,45 +398,56 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -447,53 +474,57 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
+msgid "Chec_k"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
-msgid "Software Updates"
+msgid "Show progress of single files"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:16
-msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+msgid "Software Updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
-msgid "U_pgrade"
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
-msgid "Upgrade to the latest version of Ubuntu"
+msgid "U_pgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:19
-msgid "_Hide this information in the future"
+msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:20
-msgid "_Install Updates"
+msgid "_Check"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:1
@@ -556,7 +587,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -568,34 +599,44 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
-msgid "<b>Distribution:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Components:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Distribution:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Sections</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -604,36 +645,40 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -679,22 +724,22 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr ""
 
 #. Description
@@ -718,8 +763,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -773,6 +818,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
diff --git a/po/de.po b/po/de.po
index 19f34331..fe00df99 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2006-03-10 17:54+0100\n"
 "Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
@@ -17,41 +17,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr "Alle %s Tage"
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr "Nach %s Tagen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr "Schlüssel importieren"
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Fehler beim Importieren der gewählten Datei"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist "
 "beschädigt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Fehler beim Entfernen des Schlüssels"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
 "hierfür einen Fehlerbericht."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -62,11 +62,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr "Bitte geben Sie einen Namen für die CD ein"
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr "Bitte legen Sie die CD in das Laufwerk"
 
@@ -103,23 +103,23 @@ msgstr ""
 "hierfür einen Fehlerbericht."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -129,11 +129,11 @@ msgstr ""
 "hierfür einen Fehlerbericht."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -201,29 +201,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -231,54 +239,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Ein andere Paketverwaltung läuft bereits"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Aktualisierung fertiggestellt"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -286,98 +294,106 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Aktualisierungen werden installiert..."
+msgid "Applying changes"
+msgstr "Änderungen werden heruntergeladen..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
 "hierfür einen Fehlerbericht."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Das System enthält defekte Pakete!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Details</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installieren"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Aktualisierung fertiggestellt"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -424,46 +440,59 @@ msgid "Details"
 msgstr "<b>Details</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
+# »Aktualisieren« könnte hier verwirrend sein -fa-
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Neu laden"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Aktualisierung fertiggestellt"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -490,60 +519,61 @@ msgid "Changes"
 msgstr "Änderungen"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Beschreibung"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Aktuelle Paketinformationen vom Server beziehen."
+msgid "Description"
+msgstr "Beschreibung"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Software-Aktualisierungen"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Aktualisierung fertiggestellt"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Installieren"
 
-# »Aktualisieren« könnte hier verwirrend sein -fa-
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Neu laden"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -614,7 +644,7 @@ msgid "_Check for updates automatically:"
 msgstr "_Automatisch auf Aktualisierungen überprüfen:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -626,36 +656,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Details</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponenten</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sparten:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sektionen:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -671,15 +712,15 @@ msgstr ""
 "<i>»deb http://ftp.debian.org sarge main«</i>. Eine ausführliche "
 "Beschreibung des Syntax ist in der Dokumentation zu finden."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT-Zeile:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr "Kanal hinzufügen"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -687,22 +728,28 @@ msgstr ""
 "Binär\n"
 "Quellcode"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr "Kanal bearbeiten"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
+# »Aktualisieren« könnte hier verwirrend sein -fa-
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Neu laden"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -752,25 +799,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
@@ -798,9 +845,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Offiziell unterstützt"
 
 #. CompDescription
@@ -855,6 +902,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Offiziell unterstützt"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -865,6 +918,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Aktualisierungen werden installiert..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Aktuelle Paketinformationen vom Server beziehen."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sparten:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Software-Aktualisierungen"
@@ -924,9 +988,6 @@ msgstr ""
 #~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen "
 #~ "werden."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenten</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -1046,9 +1107,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Änderungen werden heruntergeladen..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Die Aktualisierungen werden ausgeführt."
 
diff --git a/po/el.po b/po/el.po
index 123673f1..82a02bb9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-05 14:33+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
@@ -16,37 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -54,11 +54,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,34 +92,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -186,29 +186,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -216,52 +224,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -269,93 +277,101 @@ 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:135
-msgid "Installing updates"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Ενότητες:</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -401,45 +417,56 @@ msgid "Details"
 msgstr "<b>Ενότητες:</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -466,53 +493,57 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
+msgid "Chec_k"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
-msgid "Software Updates"
+msgid "Show progress of single files"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:16
-msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+msgid "Software Updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
-msgid "U_pgrade"
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
-msgid "Upgrade to the latest version of Ubuntu"
+msgid "U_pgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:19
-msgid "_Hide this information in the future"
+msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:20
-msgid "_Install Updates"
+msgid "_Check"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:1
@@ -581,7 +612,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -593,36 +624,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Ενότητες:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Σχόλιο:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Συστατικά</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Διανομή:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Ενότητες:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Ενότητες:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Τύπος:</b> "
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -638,36 +680,40 @@ msgstr ""
 "repository, για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>. "
 "Μπορείτε να βρείτε λεπτομερήςπεριγραφή του τρόπου σύνταξης στην τεκμηρίωση."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Γραμμή APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -713,22 +759,22 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr ""
 
 #. Description
@@ -752,8 +798,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -807,6 +853,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -817,6 +868,9 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Ενότητες:</b>"
+
 #, fuzzy
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Πηγές λογισμικού</b>"
@@ -825,9 +879,6 @@ msgstr ""
 #~ msgid "<b>Packages to install:</b>"
 #~ msgstr "<b>Ενότητες:</b>"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Συστατικά</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 31c7d3ed..9db0fa60 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-04-03 01:26-0500\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Error importing selected file"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "The selected file may not be a GPG key file or it might be corrupt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Error removing the key"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -95,23 +95,23 @@ msgstr ""
 "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:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -120,11 +120,11 @@ msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -192,29 +192,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -222,54 +230,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -277,97 +285,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Installing updates..."
+msgid "Applying changes"
+msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, 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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Details</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Install"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -413,46 +429,58 @@ msgid "Details"
 msgstr "<b>Details</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Reload"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Upgrade finished"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -479,59 +507,61 @@ msgid "Changes"
 msgstr "Changes"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Description"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Reload the package information from the server."
+msgid "Description"
+msgstr "Description"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Software Updates"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Upgrade finished"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Install"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Reload"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -601,7 +631,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -613,36 +643,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Details</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Components</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sections:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sections:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -658,15 +699,15 @@ msgstr ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
 "detailed description of the syntax in the documentation."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT line:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -674,22 +715,27 @@ msgstr ""
 "Binary\n"
 "Source"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Custom"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Reload"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -736,25 +782,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
@@ -782,9 +828,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Officially supported"
 
 #. CompDescription
@@ -839,6 +885,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Officially supported"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -849,6 +901,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Installing updates..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Reload the package information from the server."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sections:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Software Updates"
@@ -902,9 +965,6 @@ msgstr ""
 #~ "The following packages are found to be upgradable. You can upgrade them "
 #~ "by using the Install button."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -1018,9 +1078,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Downloading changes..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "The updates are being applied."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 71f00bd5..96e8f28c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-04-19 22:51-0400\n"
 "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
 "Language-Team: \n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Error importing selected file"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "The selected file may not be a GPG key file or it might be corrupt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Error removing the key"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -95,23 +95,23 @@ msgstr ""
 "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:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -120,11 +120,11 @@ msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -192,29 +192,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -222,55 +230,55 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Checking system configuration"
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -278,97 +286,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Installing updates..."
+msgid "Applying changes"
+msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, 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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Details</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Install"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -414,45 +430,57 @@ msgid "Details"
 msgstr "<b>Details</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Reload"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -479,58 +507,60 @@ msgid "Changes"
 msgstr "Changes"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Description"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Reload the package information from the server."
+msgid "Description"
+msgstr "Description"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Software Updates"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Installing updates..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Reload"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -602,7 +632,7 @@ msgid "_Check for updates automatically:"
 msgstr "Installing updates..."
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -614,36 +644,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Details</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Components</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sections:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sections:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -659,15 +700,15 @@ msgstr ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
 "detailed description of the syntax in the documentation."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT line:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -675,22 +716,27 @@ msgstr ""
 "Binary\n"
 "Source"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Custom"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Reload"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -737,25 +783,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
@@ -781,9 +827,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Officially supported"
 
 #. CompDescription
@@ -840,6 +886,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Officially supported"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -850,6 +902,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Installing updates..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Reload the package information from the server."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sections:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Software Updates"
@@ -884,9 +947,6 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Software Sources</b>"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -1072,9 +1132,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Downloading changes..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "There are no updated packages"
 
diff --git a/po/es.po b/po/es.po
index 13f88858..f372c4b8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-04-04 15:00+0200\n"
 "Last-Translator: Jorge Bernal <koke@amedias.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
@@ -19,41 +19,41 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Hubo un error al importar el fichero seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté "
 "corrupto."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Hubo un error al quitar la clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
 "como un fallo."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -61,11 +61,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -102,23 +102,23 @@ msgstr ""
 "como un fallo."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -128,11 +128,11 @@ msgstr ""
 "como un fallo."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -200,29 +200,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -230,54 +238,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Ya hay otro gestor de paquetes en ejecución"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualización finalizada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -285,98 +293,106 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Instalando actualizaciones..."
+msgid "Applying changes"
+msgstr "Descargando informe de cambios..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
 "como un fallo."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "¡Su sistema tiene paquetes rotos!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detalles:</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Instalar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Actualización finalizada"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -422,46 +438,58 @@ msgid "Details"
 msgstr "<b>Detalles:</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Recargar"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Actualización finalizada"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -488,59 +516,61 @@ msgid "Changes"
 msgstr "Cambios"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Descripción"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Recargar la información del paquete desde el servidor."
+msgid "Description"
+msgstr "Descripción"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Actualizaciones de software"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Actualización finalizada"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Instalar"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Recargar"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -610,7 +640,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -622,36 +652,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Detalles:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comentario:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Componentes</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribución:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Secciones:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Secciones:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -667,15 +708,15 @@ msgstr ""
 "por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Puede encontrar "
 "una descripción detallada de la sintaxis en la documentación."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Línea de APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -683,22 +724,27 @@ msgstr ""
 "Binario\n"
 "Fuente"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personalizado"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Recargar"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -745,25 +791,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Actualizaciones de Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Actualizaciones de Ubuntu 5.04"
 
 #. Description
@@ -791,9 +837,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizaciones de Ubuntu 5.04"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
 #. CompDescription
@@ -848,6 +894,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Soportado oficialmente"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -858,6 +910,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Instalando actualizaciones..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Recargar la información del paquete desde el servidor."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Secciones:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizaciones de software"
@@ -912,9 +975,6 @@ msgstr ""
 #~ "El gestor de actualizaciones encontró los siguientes paquetes "
 #~ "actualizables. Puede actualizarlos usando el botón Instalar."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componentes</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repositorio</b>"
 
@@ -1032,9 +1092,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versión %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Descargando informe de cambios..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Se están aplicando las actualizaciones."
 
diff --git a/po/fi.po b/po/fi.po
index 9933bc97..87d9d878 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-30 08:30+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <LL@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Virhe tuotaessa valittua avainta"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto"
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Virhe poistettaessa avainta"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -95,23 +95,23 @@ msgstr ""
 "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -120,11 +120,11 @@ msgstr ""
 "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -192,29 +192,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -222,54 +230,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Toinen pakettienhallinta on käynnissä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Päivitykset suoritettu"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -277,96 +285,105 @@ 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:135
-msgid "Installing updates"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+#, fuzzy
+msgid "Applying changes"
+msgstr "Ladataan muutoksia..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Järjestelmässä on rikkinäisiä paketteja!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Yksityiskohdat</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Asenna"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Päivitykset suoritettu"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -412,46 +429,58 @@ msgid "Details"
 msgstr "<b>Yksityiskohdat</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Päivitä"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Päivitykset suoritettu"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -478,59 +507,61 @@ msgid "Changes"
 msgstr "Muutokset"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Kuvaus"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Lataa pakettitiedot uudelleen palvelimelta."
+msgid "Description"
+msgstr "Kuvaus"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Ohjelmapäivitykset"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Päivitykset suoritettu"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Asenna"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Päivitä"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -599,7 +630,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -612,36 +643,47 @@ msgid "     "
 msgstr "    "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Yksityiskohdat</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentti:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponentit</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Jakelu:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Osastot:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Osastot:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Tyyppi:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -656,15 +698,15 @@ msgstr ""
 "\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät "
 "dokumentaatiosta."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT-rivi:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -672,22 +714,27 @@ msgstr ""
 "Binääri\n"
 "Lähdekoodi"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Muu"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Päivitä"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -734,25 +781,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
@@ -780,9 +827,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Virallisesti tuettu"
 
 #. CompDescription
@@ -837,6 +884,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Virallisesti tuettu"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -847,6 +900,13 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Lataa pakettitiedot uudelleen palvelimelta."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Osastot:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Ohjelmapäivitykset"
@@ -900,9 +960,6 @@ msgstr ""
 #~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
 #~ "Asenna-painiketta."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponentit</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Varasto</b>"
 
@@ -1013,9 +1070,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versio: %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Ladataan muutoksia..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Päivityksiä asennetaan."
 
diff --git a/po/fr.po b/po/fr.po
index 68a93865..c0374788 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-04-04 19:43+0200\n"
 "Last-Translator: \n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -16,41 +16,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Erreur lors du chargement du fichier sélectionné"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Le fichier sélectionné n'est peut-être pas un clé GPG ou alors il est "
 "corrompu."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Erreur lors de la suppression de la clé"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
 "ceci comme étant un bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -58,11 +58,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -99,23 +99,23 @@ msgstr ""
 "ceci comme étant un bug."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -125,11 +125,11 @@ msgstr ""
 "ceci comme étant un bug."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -197,29 +197,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -227,54 +235,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Un autre gestionnaire de paquets est en fonctionnement"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Mise à jour terminée"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -282,98 +290,106 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Installation des mises à jour..."
+msgid "Applying changes"
+msgstr "Téléchargement des changements..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
 "ceci comme étant un bug."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Votre système a des paquets cassés !"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Détails</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Mise à jour terminée"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -419,46 +435,58 @@ msgid "Details"
 msgstr "<b>Détails</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Recharger"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Mise à jour terminée"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -485,59 +513,61 @@ msgid "Changes"
 msgstr "Changements"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Description"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Recharger les informations des paquets depuis le serveur"
+msgid "Description"
+msgstr "Description"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Mises à jour des logiciels"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Mise à jour terminée"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Installer"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Recharger"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -607,7 +637,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -620,36 +650,47 @@ msgid "     "
 msgstr "    "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Détails</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Commentaire :</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Composants</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution :</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sections :</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sections :</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Type :</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI :</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -665,15 +706,15 @@ msgstr ""
 "exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une "
 "description détaillée de la syntaxe dans la documentation."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Ligne APT :"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -681,22 +722,27 @@ msgstr ""
 "Binaire\n"
 "Source"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personnalisé"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Recharger"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -743,25 +789,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Mises à jour de sécurité"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Mises à jour de sécurité"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Mises à jour d'Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Mises à jour d'Ubuntu 5.04"
 
 #. Description
@@ -789,9 +835,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Mises à jour d'Ubuntu 5.04"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Supportés officiellement"
 
 #. CompDescription
@@ -846,6 +892,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Supportés officiellement"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -856,6 +908,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Installation des mises à jour..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Recharger les informations des paquets depuis le serveur"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sections :</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Mises à jour des logiciels"
@@ -910,9 +973,6 @@ msgstr ""
 #~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à "
 #~ "jour en utilisant le bouton Installer."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Composants</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Dépôt</b>"
 
@@ -1031,9 +1091,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s : \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Téléchargement des changements..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Les mises à jour ont été appliquées."
 
diff --git a/po/gl.po b/po/gl.po
index 630263bf..7e361d24 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-12-02 15:59+0100\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -17,41 +17,41 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Erro importando o ficheiro seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Erro ao quitar a clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -59,11 +59,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -100,23 +100,23 @@ msgstr ""
 "erro."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -126,11 +126,11 @@ msgstr ""
 "erro."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -198,29 +198,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -228,54 +236,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Xa hai outro xestor de paquetes en execución"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualización rematada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -283,97 +291,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Instalando actualizacións..."
+msgid "Applying changes"
+msgstr "Descargando cambios..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
 "erro."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Claves</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Instalar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Actualización rematada"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -419,45 +435,57 @@ msgid "Details"
 msgstr "<b>Detalles</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Recargar"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -484,58 +512,61 @@ msgid "Changes"
 msgstr "Cambios"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Descrición"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Comprobando se hai actualizacións..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Recargar a información do paquete desde o servidor."
+msgid "Description"
+msgstr "Descrición"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Actualizacións de software"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Instalando actualizacións..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Recargar"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -603,7 +634,7 @@ msgid "_Check for updates automatically:"
 msgstr "Comprobar se hai actualizacións cada"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -615,36 +646,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Claves</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comentario:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Compoñentes</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribución:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Seccións:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Seccións:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -660,15 +702,15 @@ msgstr ""
 "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha "
 "descrición detallada da sintase na documentación."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Liña de APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -676,22 +718,27 @@ msgstr ""
 "Binario\n"
 "Fonte"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personalizar"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Recargar"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -738,25 +785,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Actualizacións de Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
@@ -782,9 +829,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Soporte oficial"
 
 #. CompDescription
@@ -841,6 +888,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Inestable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Soporte oficial"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -851,6 +904,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Instalando actualizacións..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Recargar a información do paquete desde o servidor."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Seccións:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizacións de software"
@@ -888,9 +952,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "día(s)"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Compoñentes</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repositorio</b>"
 
@@ -1056,9 +1117,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versión %s:\n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Descargando cambios..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Non hai paquetes actualizados"
 
@@ -1091,9 +1149,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Actualizando a lista de paquetes..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Comprobando se hai actualizacións..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Non hai actualizacións dispoñibles."
 
diff --git a/po/he.po b/po/he.po
index 2c83d8a7..4f64e5e7 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-08-07 14:49+0300\n"
 "Last-Translator: Yuval Tanny\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -20,37 +20,37 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "שגיאה בייבוא קובץ נבחר"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "שגיאה בהסרת המפתח"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -58,11 +58,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -97,23 +97,23 @@ msgid ""
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -121,11 +121,11 @@ msgid ""
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -193,29 +193,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,54 +231,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "מנהל חבילות אחר רץ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "השדרוג הסתיים"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -278,95 +286,103 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "מתקין עדכונים..."
+msgid "Applying changes"
+msgstr "מוריד שינויים..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>מפתחות</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_התקן"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "השדרוג הסתיים"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -412,45 +428,57 @@ msgid "Details"
 msgstr "<b>פרטים</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "טען מחדש"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -477,58 +505,61 @@ msgid "Changes"
 msgstr "שינויים"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "תיאור"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "בודק אם יש עדכונים..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "טען מחדש את המידע על החבילה מהשרת"
+msgid "Description"
+msgstr "תיאור"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "עדכוני תוכנה"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "מתקין עדכונים..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "טען מחדש"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -596,7 +627,7 @@ msgid "_Check for updates automatically:"
 msgstr "בדוק לעדכונים כל"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -608,36 +639,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>מפתחות</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>הערות:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>רכיבים</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>הפצה:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>מחלקה:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>מחלקה:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>סוג:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>כתובת:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -652,15 +694,15 @@ msgstr ""
 "org sarge main\"</i>\n"
 "אפשר למצוא הסבר מפורט על זה בתיעוד."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT שורת:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -668,22 +710,27 @@ msgstr ""
 "מקור\n"
 "בינארי"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_התאם אישית"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "טען מחדש"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -730,25 +777,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "עדכונים - אובונטו 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
@@ -774,9 +821,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "נתמך רשמית"
 
 #. CompDescription
@@ -833,6 +880,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "דביאן לא ארה\"ב (לא יציב)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "נתמך רשמית"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -843,6 +896,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "מתקין עדכונים..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "טען מחדש את המידע על החבילה מהשרת"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>מחלקה:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "עדכוני תוכנה"
@@ -879,9 +943,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ימים"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>רכיבים</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>מאגר</b>"
 
@@ -1052,9 +1113,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "גרסה %s:\n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "מוריד שינויים..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "אין חבילות מעודכנות"
 
@@ -1086,9 +1144,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "מעדכן רשימת חבילות..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "בודק אם יש עדכונים..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "אין עדכונים זמינים."
 
diff --git a/po/hu.po b/po/hu.po
index 0d710f03..c5b08ea5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-04-03 12:32+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -17,38 +17,38 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Hiba a kiválasztott fájl importálása közben"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Hiba a kulcs eltávolítása közben"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -96,23 +96,23 @@ msgstr ""
 "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -121,11 +121,11 @@ msgstr ""
 "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -193,29 +193,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,54 +231,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Már fut egy másik csomagkezelő"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "A frissítés befejeződött"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -278,94 +286,102 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Frissítések telepítése..."
+msgid "Applying changes"
+msgstr "Módosítások letöltése..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "A rendszerén törött csomagok vannak!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Részletek</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Telepítés"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "A frissítés befejeződött"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -411,46 +427,58 @@ msgid "Details"
 msgstr "<b>Részletek</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Újratöltés"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "A frissítés befejeződött"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -477,59 +505,61 @@ msgid "Changes"
 msgstr "Módosítások"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Leírás"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról."
+msgid "Description"
+msgstr "Leírás"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Szoftverfrissítések"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "A frissítés befejeződött"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Telepítés"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Újratöltés"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -599,7 +629,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -611,36 +641,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Részletek</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Megjegyzés:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Összetevők</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Disztribúció:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Csoportok:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Csoportok:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Típus:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -655,15 +696,15 @@ msgstr ""
 "\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes "
 "leírását a dokumentációban találhatja meg."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT sor:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -671,22 +712,27 @@ msgstr ""
 "Bináris\n"
 "Forrás"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Egyéni"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Újratöltés"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -733,25 +779,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
@@ -779,9 +825,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Hivatalosan támogatott"
 
 #. CompDescription
@@ -836,6 +882,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Hivatalosan támogatott"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -846,6 +898,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Frissítések telepítése..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Csoportok:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Szoftverfrissítések"
@@ -899,9 +962,6 @@ msgstr ""
 #~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével "
 #~ "frissítheti őket."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Összetevők</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Tároló</b>"
 
@@ -1019,9 +1079,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "%s verzió: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Módosítások letöltése..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "A frissítések alkalmazása folyamatban."
 
diff --git a/po/it.po b/po/it.po
index f74f7d21..11ba78ef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-10-26 12:25+0200\n"
 "Last-Translator: Fabio Marzocca <thesaltydog@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,41 +17,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Errore nell'importazione del file selezionato"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe "
 "essere corrotto."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Errore rimuovendo la chiave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "La chiave selezionata non può essere rimossa. Per favore riporta questo come "
 "bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -59,11 +59,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -100,23 +100,23 @@ msgstr ""
 "bug."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -126,11 +126,11 @@ msgstr ""
 "bug."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -198,29 +198,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -228,54 +236,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Un altro gestore di pacchetti è in esecuzione"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Aggiornamento terminato"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -283,97 +291,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Installazione degli aggiornamenti..."
+msgid "Applying changes"
+msgstr "Download modifiche in corso..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "La chiave selezionata non può essere rimossa. Per favore riporta questo come "
 "bug."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Chiavi</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installa"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Aggiornamento terminato"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -419,45 +435,57 @@ msgid "Details"
 msgstr "<b>Dettagli</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Ricarica"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -484,58 +512,61 @@ msgid "Changes"
 msgstr "Modifiche"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Descrizione"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Verifica degli aggiornamenti..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Ricarica le informazioni del pacchetto dal server"
+msgid "Description"
+msgstr "Descrizione"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Aggiornamenti Software"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Installazione degli aggiornamenti..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Ricarica"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -603,7 +634,7 @@ msgid "_Check for updates automatically:"
 msgstr "Verifica aggiornamenti ogni"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -615,36 +646,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Chiavi</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Commento:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Componenti</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribuzione:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sezioni:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sezioni:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -660,15 +702,15 @@ msgstr ""
 "ad esempio <i>\"deb http://ftp.debian.org sarge main\"</i>. Puoi trovare una "
 "descrizione dettagliata della sintassi nella documentazione."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Riga APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -676,22 +718,27 @@ msgstr ""
 "Binari\n"
 "Sorgenti"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personalizzato"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Ricarica"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -738,25 +785,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Aggiornamenti di Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Aggiornamenti di Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Aggiornamenti di Ubuntu 5.10"
 
 #. Description
@@ -782,9 +829,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Aggiornamenti di Ubuntu 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Supportato ufficialmente"
 
 #. CompDescription
@@ -841,6 +888,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian·Non-US·(Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Supportato ufficialmente"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -851,6 +904,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Installazione degli aggiornamenti..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Ricarica le informazioni del pacchetto dal server"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sezioni:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Aggiornamenti Software"
@@ -889,9 +953,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "giorni"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componenti</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -1058,9 +1119,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versione %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Download modifiche in corso..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Non ci sono apacchetti aggiornati"
 
@@ -1086,9 +1144,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Aggiornamento della lista dei pacchetti..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Verifica degli aggiornamenti..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Non ci sono aggiornamenti disponibili."
 
diff --git a/po/ja.po b/po/ja.po
index a645b20b..33d9c88a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-10-12 17:28+0900\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "選択したファイルのインポートエラー"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "キー削除のエラー"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -95,23 +95,23 @@ msgid ""
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -119,11 +119,11 @@ msgid ""
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -191,29 +191,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -221,54 +229,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "他のパッケージマネージャが動いています"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "アップグレードが終了しました"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -276,96 +284,104 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "アップデートをインストール中..."
+msgid "Applying changes"
+msgstr "変更点を取得中..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "システムに壊れたパッケージがあります！"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>詳細</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "インストール(_I)"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "アップグレードが終了しました"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -411,45 +427,57 @@ msgid "Details"
 msgstr "<b>詳細</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "再読込"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -476,58 +504,60 @@ msgid "Changes"
 msgstr "変更点"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "詳細"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "サーバからパッケージ情報を再度読み込む。"
+msgid "Description"
+msgstr "詳細"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "ソフトウェアのアップデート"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "アップデートをインストール中..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "再読込"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -597,7 +627,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -609,36 +639,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>詳細</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>コメント:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>コンポーネント</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>ディストリビューション:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>セクション:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>セクション:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>タイプ:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -653,15 +694,15 @@ msgstr ""
 "ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式について書か"
 "れています。"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT line:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -669,22 +710,27 @@ msgstr ""
 "バイナリ\n"
 "ソース"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "再読込"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -731,25 +777,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
 #. Description
@@ -775,9 +821,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "公式サポート"
 
 #. CompDescription
@@ -832,6 +878,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "公式サポート"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -842,6 +894,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "アップデートをインストール中..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "サーバからパッケージ情報を再度読み込む。"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>セクション:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "ソフトウェアのアップデート"
@@ -881,9 +944,6 @@ msgstr ""
 #~ msgid "Choose a key-file"
 #~ msgstr "キーファイルを選択"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>コンポーネント</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>リポジトリ</b>"
 
@@ -1065,9 +1125,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "バージョン %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "変更点を取得中..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "アップデートされました。"
 
diff --git a/po/lt.po b/po/lt.po
index d9f01e8b..73454cec 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-09-15 15:06+0300\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Importuojant pasirinktą bylą įvyko klaida"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Pasirinkta byla gali būti ne GPG rakto byla arba sugadinta byla."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Šalinant raktą įvyko klaida"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -96,23 +96,23 @@ msgstr ""
 "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -121,11 +121,11 @@ msgstr ""
 "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -193,29 +193,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,54 +231,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Šiuo metu jau veikia kita paketų tvarkyklė"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Atnaujinimas baigtas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -278,33 +286,41 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Diegiami atnaujinimai..."
+msgid "Applying changes"
+msgstr "Parsiunčiami pakeitimai..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -312,7 +328,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -320,7 +336,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -328,49 +344,49 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Raktai</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "Į_diegti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Atnaujinimas baigtas"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -416,45 +432,57 @@ msgid "Details"
 msgstr "<b>Detalės</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Atnaujinti"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -481,58 +509,61 @@ msgid "Changes"
 msgstr "Pakeitimai"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Aprašymas"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Ieškoma atnaujinimų..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Atnaujinti serverio paketų informaciją."
+msgid "Description"
+msgstr "Aprašymas"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Programinės įrangos atnaujinimai"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Diegiami atnaujinimai..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Atnaujinti"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -600,7 +631,7 @@ msgid "_Check for updates automatically:"
 msgstr "Tikrinti atnaujinimus kas"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -612,36 +643,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Raktai</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Komentaras:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponentai</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribucija:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Skyriai:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Skyriai:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Tipas:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -656,15 +698,15 @@ msgstr ""
 "debian.org sarge main“</i>. Išsamesnį sintaksės aprašymą galite rasti "
 "dokumentacijoje."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT eilutė:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -672,22 +714,27 @@ msgstr ""
 "Dvejetainis\n"
 "Pradinis kodas"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Kita"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Atnaujinti"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -734,25 +781,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 atnaujinimai"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
@@ -778,9 +825,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Prižiūrima oficialiai"
 
 #. CompDescription
@@ -837,6 +884,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Prižiūrima oficialiai"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -847,6 +900,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Diegiami atnaujinimai..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Atnaujinti serverio paketų informaciją."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Skyriai:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Programinės įrangos atnaujinimai"
@@ -883,9 +947,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "dieną(as)"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponentai</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Saugykla</b>"
 
@@ -1066,9 +1127,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versija %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Parsiunčiami pakeitimai..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Nėra atnaujintų paketų"
 
@@ -1104,9 +1162,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Atnaujinamas paketų sąrašas..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Ieškoma atnaujinimų..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Nėra atnaujinimų."
 
diff --git a/po/mk.po b/po/mk.po
index c3603296..9db35515 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-07-20 01:21+0200\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Грешка при увоз на избраната датотека"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Избраната датотека може да не е GPG датотека или пак може да е расипана."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Грешка при отстранување на клучот"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -58,11 +58,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -99,23 +99,23 @@ msgstr ""
 "како бубачка."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -125,11 +125,11 @@ msgstr ""
 "како бубачка."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -197,29 +197,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -227,54 +235,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Веќе работи друг менаџер за пакети"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Надградбата е завршена"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -282,34 +290,42 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Инсталирам надградби..."
+msgid "Applying changes"
+msgstr "Преземам промени..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -317,7 +333,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -325,7 +341,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -333,49 +349,49 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Копчиња</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Инсталирај"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Надградбата е завршена"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -421,45 +437,57 @@ msgid "Details"
 msgstr "<b>Детали</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Освежи"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -486,58 +514,61 @@ msgid "Changes"
 msgstr "Промени"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Опис"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Проверувам за надградби..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Освежи ги информациите за пакетите на серверот."
+msgid "Description"
+msgstr "Опис"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Надградба на софтвер"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Инсталирам надградби..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Освежи"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -605,7 +636,7 @@ msgid "_Check for updates automatically:"
 msgstr "Проверувај за надградби на секои"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -617,36 +648,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Копчиња</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Компоненти</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Дистрибуција:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Оддели:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Оддели:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Тип:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>Адреса:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -662,15 +704,15 @@ msgstr ""
 "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата "
 "можете да најдете детален опис на синтаксата."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT линија:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -678,22 +720,27 @@ msgstr ""
 "Бинарни\n"
 "Изворен код"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Сопствено"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Освежи"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -740,25 +787,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
@@ -784,9 +831,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Официјално поддржано"
 
 #. CompDescription
@@ -843,6 +890,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Официјално поддржано"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -853,6 +906,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Инсталирам надградби..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Освежи ги информациите за пакетите на серверот."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Оддели:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Надградба на софтвер"
@@ -889,9 +953,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ден(а)"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненти</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Складиште</b>"
 
@@ -1056,9 +1117,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Верзија %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Преземам промени..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Нема надградени пакети"
 
@@ -1094,9 +1152,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Ја ажурирам листата на пакети..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Проверувам за надградби..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Нема достапни надградби."
 
diff --git a/po/nb.po b/po/nb.po
index f415a18e..f866b068 100644
--- a/po/nb.po
+++ b/po/nb.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-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+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"
@@ -17,38 +17,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Feil under importering av fil"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Feil under fjerning av nøkkel"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -96,23 +96,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:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -121,11 +121,11 @@ msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -193,29 +193,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,55 +231,55 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "En annen pakkehåndterer kjører"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Undersøker systemkonfigurasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -279,97 +287,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Installerer oppdateringer..."
+msgid "Applying changes"
+msgstr "Laster ned endringer..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Systemet har ødelagte pakker!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -415,45 +431,57 @@ msgid "Details"
 msgstr "<b>Detaljer</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Oppdater"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -480,58 +508,60 @@ msgid "Changes"
 msgstr "Endringer"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Beskrivelse"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Oppdater pakkeinformasjonen fra tjeneren."
+msgid "Description"
+msgstr "Beskrivelse"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Programvareoppdateringer"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Installerer oppdateringer..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Oppdater"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -602,7 +632,7 @@ msgid "_Check for updates automatically:"
 msgstr "Installerer oppdateringer..."
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -614,36 +644,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponenter</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribusjon:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Seksjoner:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Seksjoner:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -658,15 +699,15 @@ msgstr ""
 "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
 "detaljert beskrivelse av syntaksen i dokumentasjonen."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT-linje:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -674,22 +715,27 @@ msgstr ""
 "Binær\n"
 "Kilde"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Tilpasset"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Oppdater"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -736,25 +782,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
@@ -780,9 +826,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. CompDescription
@@ -839,6 +885,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Offisielt støttet"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -849,6 +901,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Installerer oppdateringer..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Oppdater pakkeinformasjonen fra tjeneren."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Seksjoner:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Programvareoppdateringer"
@@ -883,9 +946,6 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Programvarekilder</b>"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Arkiv</b>"
 
@@ -1066,9 +1126,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versjon %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Laster ned endringer..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Det er ingen utdaterte pakker"
 
diff --git a/po/ne.po b/po/ne.po
index fd77dfa5..52f3601e 100755
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-07-03 16:06+0545\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -18,37 +18,37 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2;plural=(n!=0)\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ"
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "कुञ्जि हटाउँदा त्रुटि"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -95,23 +95,23 @@ msgid ""
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -119,11 +119,11 @@ msgid ""
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -191,29 +191,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -221,54 +229,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "स्तरवृद्धि समाप्त"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -276,96 +284,104 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+msgid "Applying changes"
+msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>विवरणहरु</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "स्थापना गर्नुहोस"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "स्तरवृद्धि समाप्त"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -411,45 +427,57 @@ msgid "Details"
 msgstr "<b>विवरणहरु</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "फेरि लोड गर्नुहोस"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -476,58 +504,60 @@ msgid "Changes"
 msgstr "परिवर्तनहरु"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "बर्णन"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस"
+msgid "Description"
+msgstr "बर्णन"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "सफ्टवेयर अद्यावधिकहरु"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "फेरि लोड गर्नुहोस"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -599,7 +629,7 @@ msgid "_Check for updates automatically:"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -611,36 +641,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>विवरणहरु</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>टिप्पणि:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>तत्वहरु</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>वितरण:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>सेक्सनहरु:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>सेक्सनहरु:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>प्रकार:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>युआरएल:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -655,15 +696,15 @@ msgstr ""
 "http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा "
 "विस्तृत विवरण पाउन सक्नुहुन्छ"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "एपिटि हरफ:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -671,22 +712,27 @@ msgstr ""
 "बाइनरी\n"
 "स्रोत"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "अनुकुलन गर्नुहोस"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "फेरि लोड गर्नुहोस"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -733,25 +779,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
@@ -779,9 +825,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. CompDescription
@@ -837,6 +883,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "कार्यालय बाट समर्थित"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -847,6 +899,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>सेक्सनहरु:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "सफ्टवेयर अद्यावधिकहरु"
@@ -881,9 +944,6 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>सफ्टवेयर स्रोतहरु</b>"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>तत्वहरु</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>कोष</b>"
 
@@ -1042,9 +1102,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "संस्करण %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
 #, fuzzy
 #~ msgid "There are no updated packages"
 #~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन"
diff --git a/po/nl.po b/po/nl.po
index 0b5b89b7..04f44639 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-07-13 06:24+0100\n"
 "Last-Translator: Michiel Sikkes <michiels@gnome.org>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -16,37 +16,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -54,11 +54,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,34 +92,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -186,29 +186,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -216,52 +224,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -269,93 +277,101 @@ 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:135
-msgid "Installing updates"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -400,45 +416,56 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -465,53 +492,57 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
+msgid "Chec_k"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
-msgid "Software Updates"
+msgid "Show progress of single files"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:16
-msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+msgid "Software Updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
-msgid "U_pgrade"
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
-msgid "Upgrade to the latest version of Ubuntu"
+msgid "U_pgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:19
-msgid "_Hide this information in the future"
+msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:20
-msgid "_Install Updates"
+msgid "_Check"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:1
@@ -574,7 +605,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -586,34 +617,44 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
-msgid "<b>Distribution:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Components:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Distribution:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Sections</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -622,36 +663,40 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -697,22 +742,22 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr ""
 
 #. Description
@@ -736,8 +781,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -791,6 +836,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
diff --git a/po/no.po b/po/no.po
index f415a18e..f866b068 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-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+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"
@@ -17,38 +17,38 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Feil under importering av fil"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Feil under fjerning av nøkkel"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -96,23 +96,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:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -121,11 +121,11 @@ msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -193,29 +193,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,55 +231,55 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "En annen pakkehåndterer kjører"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Undersøker systemkonfigurasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -279,97 +287,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Installerer oppdateringer..."
+msgid "Applying changes"
+msgstr "Laster ned endringer..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Systemet har ødelagte pakker!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -415,45 +431,57 @@ msgid "Details"
 msgstr "<b>Detaljer</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Oppdater"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -480,58 +508,60 @@ msgid "Changes"
 msgstr "Endringer"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Beskrivelse"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Oppdater pakkeinformasjonen fra tjeneren."
+msgid "Description"
+msgstr "Beskrivelse"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Programvareoppdateringer"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Installerer oppdateringer..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Oppdater"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -602,7 +632,7 @@ msgid "_Check for updates automatically:"
 msgstr "Installerer oppdateringer..."
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -614,36 +644,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponenter</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribusjon:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Seksjoner:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Seksjoner:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -658,15 +699,15 @@ msgstr ""
 "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
 "detaljert beskrivelse av syntaksen i dokumentasjonen."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT-linje:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -674,22 +715,27 @@ msgstr ""
 "Binær\n"
 "Kilde"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Tilpasset"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Oppdater"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -736,25 +782,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
@@ -780,9 +826,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. CompDescription
@@ -839,6 +885,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Offisielt støttet"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -849,6 +901,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Installerer oppdateringer..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Oppdater pakkeinformasjonen fra tjeneren."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Seksjoner:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Programvareoppdateringer"
@@ -883,9 +946,6 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Programvarekilder</b>"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Arkiv</b>"
 
@@ -1066,9 +1126,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versjon %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Laster ned endringer..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Det er ingen utdaterte pakker"
 
diff --git a/po/pa.po b/po/pa.po
index 2ea930ea..d1423b14 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-10-23 10:48-0200\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -93,34 +93,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -187,29 +187,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -217,53 +225,53 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -271,94 +279,101 @@ 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:135
-#, fuzzy
-msgid "Installing updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -404,46 +419,57 @@ msgid "Details"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -470,59 +496,63 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
+msgid "Chec_k"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:14
 #, fuzzy
 msgid "Show details"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:16
 #, fuzzy
 msgid "Software Updates"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
-msgstr ""
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -590,7 +620,7 @@ msgid "_Check for updates automatically:"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -602,40 +632,50 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 #, fuzzy
 msgid "<b>Comment:</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
-msgid "<b>Distribution:</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
 #, fuzzy
-msgid "<b>Sections:</b>"
+msgid "<b>Components:</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 #, fuzzy
 msgid "<b>URI:</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -644,36 +684,40 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -720,22 +764,22 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr ""
 
 #. Description
@@ -759,8 +803,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -814,6 +858,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -824,6 +873,14 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#, fuzzy
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>ਵੇਰਵਾ</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
diff --git a/po/pl.po b/po/pl.po
index 150358a3..8bb5c6de 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-25 17:23+0100\n"
 "Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
@@ -15,37 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Błąd podczas importu wybranego pliku"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Błąd podczas usuwania klucza"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 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:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +53,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,23 +92,23 @@ msgid ""
 msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -116,11 +116,11 @@ msgid ""
 msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -188,29 +188,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -218,54 +226,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Działa inny menadżer pakietów"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Aktualizowanie zakończone"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -273,96 +281,104 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Instalacja pakietów..."
+msgid "Applying changes"
+msgstr "Pobieranie informacji o zmianach..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Twój system zawiera uszkodzone pakiety!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Szczegóły</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Instaluj"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Aktualizowanie zakończone"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -408,46 +424,58 @@ msgid "Details"
 msgstr "<b>Szczegóły</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Wczytaj ponownie"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Aktualizowanie zakończone"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -474,59 +502,61 @@ msgid "Changes"
 msgstr "Zmiany"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Opis"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Wczytuje ponownie z serwera informacje o pakietach."
+msgid "Description"
+msgstr "Opis"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Aktualizacje oprogramowania"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Aktualizowanie zakończone"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Instaluj"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Wczytaj ponownie"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -596,7 +626,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -608,36 +638,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Szczegóły</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Komentarz:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponenty</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Dystrybucja:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sekcje:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sekcje:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -653,15 +694,15 @@ msgstr ""
 "<i>\"deb http://ftp.debian.org sarge main\"</i>. Szczegółowy opis składni "
 "znajduje się w dokumentacji APT"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Wiersz APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -669,22 +710,27 @@ msgstr ""
 "Binarne\n"
 "Źródłowe"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Zaawansowane"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Wczytaj ponownie"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -731,25 +777,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Uaktualnienia Ubuntu 4.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Uaktualnienia Ubuntu 4.10"
 
 #. Description
@@ -777,9 +823,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Uaktualnienia Ubuntu 4.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Wspierane oficjalnie"
 
 #. CompDescription
@@ -834,6 +880,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Wspierane oficjalnie"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -844,6 +896,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Instalacja pakietów..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Wczytuje ponownie z serwera informacje o pakietach."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sekcje:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Aktualizacje oprogramowania"
@@ -899,9 +962,6 @@ msgstr ""
 #~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
 #~ "klikając przycisk Instaluj."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenty</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repozytorium</b>"
 
@@ -1020,9 +1080,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Wersja %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Pobieranie informacji o zmianach..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Aktualizacje są teraz instalowane."
 
diff --git a/po/pt.po b/po/pt.po
index 1b9d8549..1df5c9b3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-29 13:36-0300\n"
 "Last-Translator: Rui Az. <astronomy@mail.pt>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
@@ -14,40 +14,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr "Todos os % dias"
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr "Depois de %s dias"
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr "Importar chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Erro ao importar ficheiro seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar "
 "corrompido."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Erro ao remover a chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "A chave que seleccionou não pôde ser removida. Por favor reporte este erro."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -58,11 +58,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr "Por favor introduza um nome para o disco"
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor introduza um disco no leitor:"
 
@@ -101,11 +101,11 @@ msgstr ""
 "reporte este erro. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr "Erro ao autenticar alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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 "
@@ -115,12 +115,12 @@ msgstr ""
 "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma "
 "lista de pacotes não autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossível de instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -128,11 +128,11 @@ msgstr ""
 "Foi impossível instalar um pacote essencial. Por favor reporte este erro. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr "Impossível de descobrir meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -215,33 +215,42 @@ msgstr "Impossível de calcular a actualização"
 #: ../DistUpgrade/DistUpgradeControler.py:215
 #, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 "Ocorreu algum problema durante a actualização. Provavelmente a instalação de "
 "alguns pacotes falhou. Tente 'sudo apt-get install -f' ou use o synaptic "
 "para corrigir o seu sistema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 #, fuzzy
 msgid "Could not download the upgrades"
 msgstr "Impossível de calcular a actualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+#, fuzzy
+msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -251,52 +260,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr "A verificar gestor de pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr "A Actualizar informação de repositórios"
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr "A pedir confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr "A actualizar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr "À procura de software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr "A actualização do sistema está completa."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no leitor '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr "O Download está completo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, fuzzy, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "A fazer o download de ficheiro %li de %li com %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr "%s restantes"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, fuzzy, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr "A fazer o download de ficheiro %li de %li a velocidade desconhecida"
@@ -304,25 +313,33 @@ msgstr "A fazer o download de ficheiro %li de %li a velocidade desconhecida"
 #. 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:135
-msgid "Installing updates"
-msgstr "A instalar actualizações"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "A actualização abortará. Reporte este erro."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
@@ -332,72 +349,72 @@ msgstr ""
 "inclua os ficheiros ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu "
 "relatório. A actualização abortará agora. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, fuzzy, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Um pacote essencial teria que ser removido"
 msgstr[1] "Um pacote essencial teria que ser removido"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 #, fuzzy
 msgid "Could not find any upgrades"
 msgstr "Impossível de calcular a actualização"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "O seu sistema tem pacotes quebrados!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>A ser removido: %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Instalar Actualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "A_ctualização"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr "Necessário reiniciar"
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 #, fuzzy
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
@@ -447,46 +464,59 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr "A efectuar o download e a instalar actualizações"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:11
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
 msgstr "A preparar actualização"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
 msgstr "A actualizar o Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Reler"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
 msgstr "_Reportar um erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
 msgstr "_Reiniciar agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Efectuar Actualização?"
 
 #: ../data/UpdateManager.glade.h:1
+#, fuzzy
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -523,30 +553,35 @@ msgid "Changes"
 msgstr "Alterações"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Descrição"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr "Notas de lançamento"
+#, fuzzy
+msgid "Check for available updates"
+msgstr "A efectuar o download e a instalar actualizações"
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
-msgstr "Reler a última informação sobre actualizações"
+msgid "Description"
+msgstr "Descrição"
 
 #: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr "Notas de lançamento"
+
+#: ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Mostrar detalhes"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
 msgstr "Mostrar progresso de ficheiros individuais"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Actualizações de Software"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
@@ -554,26 +589,26 @@ msgstr ""
 "Actualizações de software podem corrigir erros, eliminar problemas de "
 "segurança, e fornecer novas funcionalidades."
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr "A_ctualização"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr "Actualize para a última versão do Ubuntu"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
 msgstr "_Instalar Actualizações"
 
-#: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
-msgstr "Reler"
-
 #: ../data/SoftwareProperties.glade.h:1
 msgid "<b>Channels</b>"
 msgstr ""
@@ -634,7 +669,8 @@ msgid "_Check for updates automatically:"
 msgstr "_Procurar por actualizações automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+#, fuzzy
+msgid "_Download updates in the background, but do not install them"
 msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -647,39 +683,49 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Componentes</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 #, fuzzy
 msgid "<b>Comment:</b>"
 msgstr "<b>Componentes</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Componentes</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-#, fuzzy
-msgid "<b>Sections:</b>"
-msgstr "<b>Fontes de Software</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Fontes de Software</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -688,36 +734,40 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Linha do APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr "Reler"
+
 #: ../data/update-manager.desktop.in.h:1
 #, fuzzy
 msgid "Show and install available updates"
@@ -766,25 +816,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 6.04 \"Dapper Drake\""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Actualizações de Segurança"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
@@ -810,8 +860,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+#, fuzzy
+msgid "Officially supported"
 msgstr "Suportado Oficialmente"
 
 #. CompDescription
@@ -865,6 +916,11 @@ msgstr "http://http.us.debian.org/debian/"
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr "Suportado Oficialmente"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -875,6 +931,16 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
+#~ msgid "Installing updates"
+#~ msgstr "A instalar actualizações"
+
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Reler a última informação sobre actualizações"
+
+#, fuzzy
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Fontes de Software</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizações de Software"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index edc001b5..0ad1e2d3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2006-02-19 17:39-0300\n"
 "Last-Translator: Carlos Eduardo Pedroza Santiviago <segfault@ubuntu.com>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
@@ -15,41 +15,41 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr "A cada %s dias"
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr "Após %s dias"
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr "Importar Chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Erro importando o arquivo selecionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 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 "
 "corrompido."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Erro removendo a chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -60,11 +60,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr "Por favor digite um nome para o disco"
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor insira um disco no drive:"
 
@@ -103,11 +103,11 @@ msgstr ""
 "favor reporte isto como um erro."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr "Erro autenticando alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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 "
@@ -117,12 +117,12 @@ msgstr ""
 "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes "
 "não-autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -131,11 +131,11 @@ msgstr ""
 "um erro."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr "Não foi possível adivinhar o meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -218,33 +218,42 @@ msgstr "Não foi possível calcular a atualização"
 #: ../DistUpgrade/DistUpgradeControler.py:215
 #, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 "Alguns problemas ocorreram durante a atualização. É bem provável que alguns "
 "pacotes falharam ao instalar. Tente 'sudo apt-get install -f' ou Synaptic "
 "para corrigir o seu sistema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 #, fuzzy
 msgid "Could not download the upgrades"
 msgstr "Não foi possível calcular a atualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+#, fuzzy
+msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr "Erro ao aplicar as mudanças"
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -254,52 +263,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr "Verificando o Gerenciador de Pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr "Atualizando informação do repositório"
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr "Pedindi por confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr "Atualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr "Buscando programas obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr "A Atualização do Sistema está completa."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no drive '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr "O Download está completo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, fuzzy, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Obtendo arquivo %li de %li com %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr "Faltam %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, fuzzy, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr "Obtendo arquivo %li de %li com velocidade desconhecida"
@@ -307,25 +316,34 @@ msgstr "Obtendo arquivo %li de %li com velocidade desconhecida"
 #. 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:135
-msgid "Installing updates"
-msgstr "Instalando Atualizações"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+#, fuzzy
+msgid "Applying changes"
+msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "A atualização irá abortar. Por favor reporte o erro."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
@@ -335,72 +353,72 @@ msgstr ""
 "erro e inclua os arquivos ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu "
 "relatório. A atualização irá abortar agora."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, fuzzy, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Um pacote essencial teria que ser removido"
 msgstr[1] "Um pacote essencial teria que ser removido"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 #, fuzzy
 msgid "Could not find any upgrades"
 msgstr "Não foi possível calcular a atualização"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>A serem removidos: %s </b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Instalar Atualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "At_ualizar"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr "Reinicialização requerida"
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 #, fuzzy
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
@@ -450,47 +468,60 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr "Obtendo e instalando as atualizações"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:11
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 #, fuzzy
 msgid "Modifying the software channels"
 msgstr "Modificando os canais de programas"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
 msgstr "Preparando a Atualização"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
 msgstr "Atualizando o Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "_Recarregar"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
 msgstr "Reportar _Erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
 msgstr "_Reiniciar Agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Realizar a Atualização?"
 
 #: ../data/UpdateManager.glade.h:1
+#, fuzzy
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -527,30 +558,35 @@ msgid "Changes"
 msgstr "Mudanças"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Descrição"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr "Notas de Versão"
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Obtendo e instalando as atualizações"
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
-msgstr "Recarregar as últimas informações sobre atualizações"
+msgid "Description"
+msgstr "Descrição"
 
 #: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr "Notas de Versão"
+
+#: ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Exibir Detalhes"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
 msgstr "Exibir progresso de arquivos únicos"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Atualizações de Programas"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
@@ -558,26 +594,26 @@ msgstr ""
 "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de "
 "segurança, e prover novas funcionalidades para você."
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr "At_ualizar"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr "Atualizar para a última versão do Ubuntu"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
 msgstr "_Instalar Atualizações"
 
-#: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
-msgstr "_Recarregar"
-
 #: ../data/SoftwareProperties.glade.h:1
 msgid "<b>Channels</b>"
 msgstr "<b>Canais</b>"
@@ -638,7 +674,8 @@ msgid "_Check for updates automatically:"
 msgstr "Verifi_car por atualizações automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+#, fuzzy
+msgid "_Download updates in the background, but do not install them"
 msgstr "_Obter atualizações em segundo plano, mas não instalá-las"
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -652,36 +689,47 @@ msgid "     "
 msgstr "    "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Canais</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Components</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Sections:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sections:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -697,15 +745,15 @@ msgstr ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
 "detailed description of the syntax in the documentation."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT line:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -713,22 +761,26 @@ msgstr ""
 "Binary\n"
 "Source"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Custom"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr "_Recarregar"
+
 #: ../data/update-manager.desktop.in.h:1
 #, fuzzy
 msgid "Show and install available updates"
@@ -777,25 +829,25 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 6.04 \"Dapper Drake\""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
@@ -821,8 +873,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+#, fuzzy
+msgid "Officially supported"
 msgstr "Suportado Oficialmente"
 
 #. CompDescription
@@ -876,6 +929,11 @@ msgstr "http://http.us.debian.org/debian/"
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr "Suportado Oficialmente"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -886,6 +944,15 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
+#~ msgid "Installing updates"
+#~ msgstr "Instalando Atualizações"
+
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Recarregar as últimas informações sobre atualizações"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sections:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Modificando os canais de programas"
@@ -993,9 +1060,6 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ "The following packages are found to be upgradable. You can upgrade them "
 #~ "by using the Install button."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -1109,9 +1173,6 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Downloading changes..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "The updates are being applied."
 
diff --git a/po/ro.po b/po/ro.po
index 190adfca..2830f823 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-03 19:28+0200\n"
 "Last-Translator: Dan Damian <dand@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -16,37 +16,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -54,11 +54,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,34 +92,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -186,29 +186,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -216,54 +224,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Un alt manager de pachete rulează"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualizare completă"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -271,94 +279,103 @@ 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:135
-msgid "Installing updates"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+#, fuzzy
+msgid "Applying changes"
+msgstr "Descarc modificările..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sistemul dvs. este la zi!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detalii</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Instalează"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Actualizare completă"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -404,46 +421,57 @@ msgid "Details"
 msgstr "<b>Detalii</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Actualizare completă"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -470,58 +498,61 @@ msgid "Changes"
 msgstr "Modificări"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Descriere"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Reîncarcă informaţiile despre pachete de pe server."
+msgid "Description"
+msgstr "Descriere"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Actualizări software"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Actualizare completă"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Instalează"
 
-#: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
-msgstr ""
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -589,7 +620,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -602,36 +633,47 @@ msgid "     "
 msgstr "    "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Detalii</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comentariu:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Componente</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribuţie:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Secţiuni:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Secţiuni:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Tip:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -647,15 +689,15 @@ msgstr ""
 "\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere "
 "detaliată a sintaxei în documentaţie."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Linie APT:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -663,22 +705,26 @@ msgstr ""
 "Binar\n"
 "Sursă"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -726,25 +772,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
@@ -772,9 +818,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Pachete suportate oficial"
 
 #. CompDescription
@@ -829,6 +875,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Pachete suportate oficial"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -839,6 +891,13 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Reîncarcă informaţiile despre pachete de pe server."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Secţiuni:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizări software"
@@ -883,9 +942,6 @@ msgstr ""
 #~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
 #~ "apăsând pe butonul Instalează."
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componente</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Locaţie</b>"
 
@@ -963,9 +1019,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versiunea %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Descarc modificările..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Actualizările sunt în curs de aplicare."
 
diff --git a/po/rw.po b/po/rw.po
index e36fe6b5..32d4313c 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,41 +24,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "ULL NAME <EMAIL@ADDRESS>\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 #, fuzzy
 msgid "Error importing selected file"
 msgstr "Kuzaza Byahiswemo IDOSIYE"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 #, fuzzy
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 #, fuzzy
 msgid "Error removing the key"
 msgstr "i Urufunguzo"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 #, fuzzy
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -66,11 +66,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -105,23 +105,23 @@ msgid ""
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -129,11 +129,11 @@ msgid ""
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -201,29 +201,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -231,54 +239,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Muyobozi ni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Byarangiye"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -286,76 +294,85 @@ 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:135
-msgid "Installing updates"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+#, fuzzy
+msgid "Applying changes"
+msgstr "Amahinduka"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sisitemu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<B B"
@@ -364,21 +381,21 @@ msgstr "<B B"
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "Kwinjiza porogaramu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Byarangiye"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -424,46 +441,59 @@ msgid "Details"
 msgstr "<B B"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
+# sfx2/sdi\sfxslots.src:SID_RELOAD.text
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "Kongera Gutangiza"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Byarangiye"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -490,51 +520,58 @@ msgstr ""
 msgid "Changes"
 msgstr "Amahinduka"
 
+#: ../data/UpdateManager.glade.h:10
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Check for available updates"
+msgstr ""
+
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:12
 msgid "Description"
 msgstr "Isobanuramiterere"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:13
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
-
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Ibihuzagihe bya porogaramumudasobwa "
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Byarangiye"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
@@ -542,17 +579,11 @@ msgstr ""
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Kwinjiza porogaramu"
 
-# sfx2/sdi\sfxslots.src:SID_RELOAD.text
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Kongera Gutangiza"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -619,7 +650,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -631,41 +662,51 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 #, fuzzy
 msgid "<b>Comment:</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
 #, fuzzy
-msgid "<b>Distribution:</b>"
+msgid "<b>Components:</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 #, fuzzy
-msgid "<b>Sections:</b>"
+msgid "<b>Distribution:</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 #, fuzzy
 msgid "<b>URI:</b>"
 msgstr "<B B"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -678,39 +719,45 @@ msgstr ""
 "Na Ibikubiyemo Bya a kugirango Urugero i HTTP FTP org i Gushaka a "
 "Isobanuramiterere Bya i in i"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 #, fuzzy
 msgid "APT line:"
 msgstr "Umurongo"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 #, fuzzy
 msgid ""
 "Binary\n"
 "Source"
 msgstr "Inkomoko"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 #, fuzzy
 msgid "_Custom"
 msgstr "Guhanga"
 
+# sfx2/sdi\sfxslots.src:SID_RELOAD.text
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Kongera Gutangiza"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -757,25 +804,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "5"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "5"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "5"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "5"
 
 #. Description
@@ -803,8 +850,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "5"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -861,6 +908,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -871,6 +923,14 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
+
+#, fuzzy
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<B B"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Ibihuzagihe bya porogaramumudasobwa "
@@ -924,10 +984,6 @@ msgstr ""
 #~ "by using the Install button."
 #~ msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto"
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<B B"
-
 #, fuzzy
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<B B"
@@ -1038,10 +1094,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Verisiyo"
 
-#, fuzzy
-#~ msgid "Downloading changes..."
-#~ msgstr "Amahinduka"
-
 #, fuzzy
 #~ msgid "The updates are being applied."
 #~ msgstr "Byashyizweho"
diff --git a/po/sv.po b/po/sv.po
index 65e99f63..132d0831 100644
--- a/po/sv.po
+++ b/po/sv.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-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-26 15:14+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,38 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 #, fuzzy
 msgid "Import key"
 msgstr "Viktighet"
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -94,34 +94,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy, python-format
 msgid "Can't install '%s'"
 msgstr "inte installerad"
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -190,15 +190,15 @@ msgstr "inte installerad"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -206,14 +206,23 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
 #, fuzzy
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr " Ta bort paket "
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+#, fuzzy
+msgid "_Remove"
+msgstr "Ta bort"
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -221,55 +230,55 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "En annan pakethanterare körs"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Uppgraderingar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 #, fuzzy
 msgid "Download is complete"
 msgstr "Hämtning misslyckades"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -277,97 +286,105 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Letar efter uppdateringar..."
+msgid "Applying changes"
+msgstr "Hämtar ändringar..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy, python-format
 msgid "Could not install '%s'"
 msgstr "inte installerad"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 #, fuzzy
 msgid "Could not find any upgrades"
 msgstr "inte installerad"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Ditt system har trasiga paket!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "Installera"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Uppgraderingar"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 #, fuzzy
 msgid "Reboot required"
 msgstr "Krav"
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -412,48 +429,60 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 #, fuzzy
 msgid "Preparing the upgrade"
 msgstr "Förbereder transaktion"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 #, fuzzy
 msgid "Restarting the system"
 msgstr "Uppdaterar system"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Läs om"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Uppgraderingar"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -481,60 +510,62 @@ msgid "Changes"
 msgstr "Ändringar"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Beskrivning"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Läs om paketinformationen från servern."
+msgid "Description"
+msgstr "Beskrivning"
 
 #: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:14
 #, fuzzy
 msgid "Show details"
 msgstr "Detaljer"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Programvaruuppdateringar"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Uppgraderingar"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Letar efter uppdateringar..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Läs om"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -601,7 +632,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -613,37 +644,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "Kanaler"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Komponenter</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-#, fuzzy
-msgid "<b>Sections:</b>"
-msgstr "<b>Val</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Val</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -652,16 +693,16 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT-rad:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 #, fuzzy
 msgid "Add Channel"
 msgstr "Alla kanaler"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -669,24 +710,29 @@ msgstr ""
 "Binär\n"
 "Källkod"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 #, fuzzy
 msgid "Edit Channel"
 msgstr "Kanal"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 #, fuzzy
 msgid "_Add Channel"
 msgstr "Alla kanaler"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "An_passad"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Läs om"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -733,25 +779,26 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Brådskande uppdateringar"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Brådskande uppdateringar"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Brådskande uppdateringar"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Brådskande uppdateringar"
 
 #. Description
@@ -779,9 +826,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Brådskande uppdateringar"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Stöds officiellt"
 
 #. CompDescription
@@ -835,6 +882,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Stöds officiellt"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -846,6 +899,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Tillgängliga program"
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Letar efter uppdateringar..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Läs om paketinformationen från servern."
+
+#, fuzzy
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Val</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Programvaruuppdateringar"
@@ -900,9 +965,6 @@ msgstr "Tillgängliga program"
 #~ msgid "<b>Packages to install:</b>"
 #~ msgstr "<b>Paket att installera:</b>"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
 #, fuzzy
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Säkerhet</b>"
@@ -963,9 +1025,6 @@ msgstr "Tillgängliga program"
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Hämtar ändringar..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "Uppdateringarna verkställs."
 
@@ -2012,9 +2071,6 @@ msgstr "Tillgängliga program"
 #~ msgid "Are you sure you want to delete '%s'?"
 #~ msgstr "Är du säker på att du vill ta bort \"%s\"?"
 
-#~ msgid "Remove"
-#~ msgstr "Ta bort"
-
 #~ msgid "Privileges"
 #~ msgstr "Privilegier"
 
diff --git a/po/uk.po b/po/uk.po
index bc68f4bf..e49f9086 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-08-08 11:46+0300\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -15,37 +15,37 @@ msgstr ""
 "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:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Помилка імпорту вибраного файлу"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Помилка видалення ключа"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +53,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,23 +92,23 @@ msgid ""
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -116,11 +116,11 @@ msgid ""
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -188,29 +188,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -218,54 +226,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Вже активний інший менеджер пакетів"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Оновлення завершено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -273,32 +281,40 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Встановлення оновлень..."
+msgid "Applying changes"
+msgstr "Завантаження змін..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -306,7 +322,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -314,7 +330,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -322,49 +338,49 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Клавіші</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Встановити"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Оновлення завершено"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -410,45 +426,57 @@ msgid "Details"
 msgstr "<b>Подробиці</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Перезавантажити"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -475,58 +503,61 @@ msgid "Changes"
 msgstr "Зміни"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Опис"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Перевірка оновлень ..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Перезавантажити з сервера інформацію про пакет"
+msgid "Description"
+msgstr "Опис"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Оновлення програм"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Встановлення оновлень..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Перезавантажити"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -594,7 +625,7 @@ msgid "_Check for updates automatically:"
 msgstr "Перевіряти оновлення кожні"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -606,36 +637,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Клавіші</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Компоненти</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Дистрибутив:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Розділи:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Розділи:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Тип:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -651,15 +693,15 @@ msgstr ""
 "http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у "
 "документації."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Рядок APT"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -667,22 +709,27 @@ msgstr ""
 "Двійкові\n"
 "вихідні"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "В_ласний"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Перезавантажити"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -729,25 +776,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Оновлення Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Оновлення безпеки Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. Description
@@ -773,9 +820,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Офіціально підтримуються"
 
 #. CompDescription
@@ -832,6 +879,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian поза США (Нестабільний)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Офіціально підтримуються"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -842,6 +895,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Встановлення оновлень..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Перезавантажити з сервера інформацію про пакет"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Розділи:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Оновлення програм"
@@ -878,9 +942,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "діб"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненти</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Репозиторій</b>"
 
@@ -1059,9 +1120,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Версія %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Завантаження змін..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Немає оновлених пакетів"
 
@@ -1097,9 +1155,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Оновлення списку пакетів..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Перевірка оновлень ..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Немає доступних оновлень."
 
diff --git a/po/update-manager.pot b/po/update-manager.pot
index 26fb937c..ae488ceb 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-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+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"
@@ -17,37 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -93,34 +93,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -187,29 +187,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -217,52 +225,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -270,93 +278,101 @@ 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:135
-msgid "Installing updates"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -401,45 +417,56 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -466,53 +493,57 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
+msgid "Chec_k"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
-msgid "Software Updates"
+msgid "Show progress of single files"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:16
-msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+msgid "Software Updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
-msgid "U_pgrade"
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
-msgid "Upgrade to the latest version of Ubuntu"
+msgid "U_pgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:19
-msgid "_Hide this information in the future"
+msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:20
-msgid "_Install Updates"
+msgid "_Check"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:1
@@ -575,7 +606,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -587,34 +618,44 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
-msgid "<b>Distribution:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Components:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Distribution:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Sections</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -623,36 +664,40 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -698,22 +743,22 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr ""
 
 #. Description
@@ -737,8 +782,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -792,6 +837,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
diff --git a/po/vi.po b/po/vi.po
index d7526568..949875c2 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager Gnome HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-08-26 18:15+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -16,37 +16,37 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.2.2\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "Gặp lỗi khi nhập tâp tin đã chọn"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng."
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "Gặp lỗi khi gỡ bỏ khóa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -54,11 +54,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -93,23 +93,23 @@ msgid ""
 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:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -117,11 +117,11 @@ msgid ""
 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: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -189,29 +189,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -219,54 +227,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Một bộ quản lý gói khác đang chạy"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "Nâng cấp xong"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -274,92 +282,100 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "Đang cài đặt bản cập nhật..."
+msgid "Applying changes"
+msgstr "Đang tài về các thay đổi..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Khóa</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Cài đặt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Nâng cấp xong"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -405,45 +421,57 @@ msgid "Details"
 msgstr "<b>Chi tiết</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "Tải lại"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -470,58 +498,61 @@ msgid "Changes"
 msgstr "Đổi"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "Mô tả"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "Đang kiểm tra có cập nhật..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "Tải lại thông tin gói từ máy phục vụ."
+msgid "Description"
+msgstr "Mô tả"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "Bản cập nhật phần mềm"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "Tải lại"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -589,7 +620,7 @@ msgid "_Check for updates automatically:"
 msgstr "Kiểm tra có cập nhật sau mỗi"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -601,36 +632,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>Khóa</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Ghi chú :</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>Thành phần</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Bản phát hành:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>Phần:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Phần:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>Kiểu:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>Địa chỉ định vị:</b> "
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -645,15 +687,15 @@ msgstr ""
 "http://ftp.debian.org sarge main\"</i>. Bạn có thể tìm mô tả chi tiết của cú "
 "pháp này trong tài liệu hướng dẫn."
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "Dòng APTL"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -661,22 +703,27 @@ msgstr ""
 "Nhị phân\n"
 "Nguồn"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "Tự _chọn"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "Tải lại"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -723,25 +770,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.04"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
@@ -767,9 +814,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. CompDescription
@@ -826,6 +873,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Không Mỹ Debian (Bất định)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "Được hỗ trợ một cách chính thức"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -836,6 +889,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Đang cài đặt bản cập nhật..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Tải lại thông tin gói từ máy phục vụ."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Phần:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Bản cập nhật phần mềm"
@@ -872,9 +936,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ngày"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Thành phần</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Kho</b>"
 
@@ -1041,9 +1102,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Phiên bản %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "Đang tài về các thay đổi..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "Không có gói nào đã cập nhật."
 
@@ -1073,9 +1131,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Đạng cập nhật danh sách gói..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "Đang kiểm tra có cập nhật..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "Không có bản cập nhật công bố."
 
diff --git a/po/xh.po b/po/xh.po
index cf9d118c..d88c6427 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-30 13:25+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -17,37 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -93,34 +93,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -187,29 +187,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -217,52 +225,52 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -270,94 +278,101 @@ 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:135
-#, fuzzy
-msgid "Installing updates"
-msgstr "Seka zonke izihlaziyo"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+msgid "Applying changes"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "Bonisa izihlaziyo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -402,45 +417,56 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -467,57 +493,61 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
+msgid "Chec_k"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Reload the latest information about updates"
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 #, fuzzy
 msgid "Software Updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../data/UpdateManager.glade.h:21
-msgid "_Reload"
-msgstr ""
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -582,7 +612,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -594,37 +624,48 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 #, fuzzy
 msgid "<b>Comment:</b>"
 msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
-msgid "<b>Distribution:</b>"
-msgstr ""
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Distribution:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -633,36 +674,40 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -709,22 +754,22 @@ msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr ""
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr ""
 
 #. Description
@@ -748,8 +793,8 @@ msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-msgid "Oficially supported"
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
 msgstr ""
 
 #. CompDescription
@@ -803,6 +848,11 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -813,6 +863,10 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "Seka zonke izihlaziyo"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Bonisa izihlaziyo"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 974c8712..c49c8196 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-03-21 22:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -15,37 +15,37 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +53,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -91,34 +91,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -185,29 +185,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -215,54 +223,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "正在运行另外一个软件包管理器"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "更新已经完成"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -270,94 +278,103 @@ 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:135
-msgid "Installing updates"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
+#, fuzzy
+msgid "Applying changes"
+msgstr "正在下载更改..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "您的系统有损坏的软件包！"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>细节</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "安装(_I)"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "更新已经完成"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -403,46 +420,58 @@ msgid "Details"
 msgstr "<b>细节</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
+msgid "_Replace"
+msgstr "重新装入"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+#, fuzzy
 msgid "_Resume Upgrade"
 msgstr "更新已经完成"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -469,59 +498,61 @@ msgid "Changes"
 msgstr "更改"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "描述"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "从服务器重新装入软件包信息。"
+msgid "Description"
+msgstr "描述"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "软件更新"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 #, fuzzy
 msgid "U_pgrade"
 msgstr "更新已经完成"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "安装(_I)"
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "重新装入"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -590,7 +621,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -602,36 +633,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>细节</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>注释：</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>组件</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>发行版：</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>节：</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>节：</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>类型：</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI：</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
@@ -640,15 +682,15 @@ msgid ""
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT 行："
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -656,22 +698,27 @@ msgstr ""
 "二进制\n"
 "源代码"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "自定义(_C)"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "重新装入"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -718,25 +765,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
@@ -764,9 +811,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "官方支持"
 
 #. CompDescription
@@ -821,6 +868,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "官方支持"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -831,6 +884,13 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "从服务器重新装入软件包信息。"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>节：</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "软件更新"
@@ -858,9 +918,6 @@ msgstr ""
 #~ msgid "<b>Packages to install:</b>"
 #~ msgstr "要安装的软件包："
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>组件</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>仓库</b>"
 
@@ -906,9 +963,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "版本 %s：\n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "正在下载更改..."
-
 #~ msgid "The updates are being applied."
 #~ msgstr "更新已经应用。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index bccebc7e..ba134daa 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-12-14 01:58+0800\n"
 "Last-Translator: Abel Cheung <abel@oaka.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -15,37 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "匯入指定檔案時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "移除密碼匙時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +53,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,23 +92,23 @@ msgid ""
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -116,11 +116,11 @@ msgid ""
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -188,29 +188,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -218,54 +226,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "另一個套件管理員正在執行中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -273,95 +281,103 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "正在安裝軟件更新..."
+msgid "Applying changes"
+msgstr "正在下載更改紀錄..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>密碼匙</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "安裝(_I)"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -407,45 +423,57 @@ msgid "Details"
 msgstr "<b>細節</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "重新載入"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -472,58 +500,61 @@ msgid "Changes"
 msgstr "更改紀錄"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "詳細說明"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "正在檢查更新套件..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "由伺服器重新載入套件資料。"
+msgid "Description"
+msgstr "詳細說明"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "軟件更新"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "正在安裝軟件更新..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "重新載入"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -591,7 +622,7 @@ msgid "_Check for updates automatically:"
 msgstr "檢查軟件更新間隔："
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -603,36 +634,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>密碼匙</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>備註:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>元件</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>發行版本:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>分類:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>分類:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>類型:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -647,15 +689,15 @@ msgstr ""
 "debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。"
 
 # (Abel): 「APT 行」實在不倫不類
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT 軟件庫:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -663,22 +705,27 @@ msgstr ""
 "可執行檔\n"
 "源程式碼"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "自選(_C)"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "重新載入"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -725,25 +772,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 安全性更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
@@ -769,9 +816,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 更新"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "官方支援"
 
 #. CompDescription
@@ -828,6 +875,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (不穩定版)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "官方支援"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -838,6 +891,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "正在安裝軟件更新..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "由伺服器重新載入套件資料。"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>分類:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "軟件更新"
@@ -874,9 +938,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "日"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>元件</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>軟件庫</b>"
 
@@ -1037,9 +1098,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "版本 %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "正在下載更改紀錄..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "沒有任何套件需要更新"
 
@@ -1071,9 +1129,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "正在更新套件清單..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "正在檢查更新套件..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "沒有任何軟件可以更新。"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 972a07fe..f2a98b5e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-12 20:39+0100\n"
+"POT-Creation-Date: 2006-03-27 16:38+0200\n"
 "PO-Revision-Date: 2005-12-14 01:58+0800\n"
 "Last-Translator: Abel Cheung <abel@oaka.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -15,37 +15,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:359
+#: ../SoftwareProperties/SoftwareProperties.py:407
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:369
+#: ../SoftwareProperties/SoftwareProperties.py:417
 msgid "Error importing selected file"
 msgstr "匯入指定檔案時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:370
+#: ../SoftwareProperties/SoftwareProperties.py:418
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:382
+#: ../SoftwareProperties/SoftwareProperties.py:430
 msgid "Error removing the key"
 msgstr "移除金鑰時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:383
+#: ../SoftwareProperties/SoftwareProperties.py:431
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:472
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +53,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:474
+#: ../SoftwareProperties/SoftwareProperties.py:529
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:490
+#: ../SoftwareProperties/SoftwareProperties.py:545
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,23 +92,23 @@ msgid ""
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:168
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:170
 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:232
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:234
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -116,11 +116,11 @@ msgid ""
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:240
+#: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:242
 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 "
@@ -188,29 +188,37 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. Please try "
-"'sudo apt-get install -f' or Synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"is now run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:230
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:232
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete Packages?"
+msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:281
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:275
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:285
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:282
+#: ../DistUpgrade/DistUpgradeControler.py:286
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -218,54 +226,54 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:296
-#: ../DistUpgrade/DistUpgradeControler.py:319
+#: ../DistUpgrade/DistUpgradeControler.py:300
+#: ../DistUpgrade/DistUpgradeControler.py:324
 #, fuzzy
 msgid "Checking package manager"
 msgstr "另一個套件管理員正在執行中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:311
+#: ../DistUpgrade/DistUpgradeControler.py:316
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:325
+#: ../DistUpgrade/DistUpgradeControler.py:330
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:329
+#: ../DistUpgrade/DistUpgradeControler.py:334
 #, fuzzy
 msgid "Upgrading"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:336
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:346
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#: ../DistUpgrade/DistUpgradeViewGtk.py:78
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:110
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 msgstr ""
@@ -273,95 +281,103 @@ 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:135
+#: ../DistUpgrade/DistUpgradeViewGtk.py:136
 #, fuzzy
-msgid "Installing updates"
-msgstr "正在安裝軟體更新..."
+msgid "Applying changes"
+msgstr "正在下載更改紀錄..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:150
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:262
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#: ../DistUpgrade/DistUpgradeViewGtk.py:263
 msgid ""
 "Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
 "dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:352
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#: ../DistUpgrade/DistUpgradeViewGtk.py:358
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:364
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#: ../DistUpgrade/DistUpgradeViewGtk.py:371
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+#: ../DistUpgrade/DistUpgradeViewGtk.py:375
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+#: ../DistUpgrade/DistUpgradeViewGtk.py:378
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:384
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#: ../DistUpgrade/DistUpgradeViewGtk.py:385
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#: ../DistUpgrade/DistUpgradeViewGtk.py:400
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>金鑰</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#: ../DistUpgrade/DistUpgradeViewGtk.py:402
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "安裝(_I)"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:404
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeView.py:67
+#: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:68
+#: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -407,45 +423,57 @@ msgid "Details"
 msgstr "<b>細節</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Downloading and installing the upgrades"
+msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Modifying the software channels"
+msgid "Downloading and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-msgid "Preparing the upgrade"
+msgid "Modifying the software channels"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
-msgid "Restarting the system"
+msgid "Preparing the upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
-msgid "Terminal"
+msgid "Restarting the system"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
-msgid "Upgrading Ubuntu"
+msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Report Bug"
+msgid "Upgrading Ubuntu"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Restart Now"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Replace"
+msgstr "重新載入"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
+"<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\"."
@@ -472,58 +500,61 @@ msgid "Changes"
 msgstr "更改紀錄"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Description"
-msgstr "詳細說明"
+msgid "Chec_k"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Release Notes"
-msgstr ""
+#, fuzzy
+msgid "Check for available updates"
+msgstr "正在檢查更新套件..."
 
 #: ../data/UpdateManager.glade.h:12
-#, fuzzy
-msgid "Reload the latest information about updates"
-msgstr "由伺服器重新載入套件資料。"
+msgid "Description"
+msgstr "詳細說明"
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Show details"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
-msgid "Show progress of single files"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "軟體更新"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:17
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
 msgstr "正在安裝軟體更新..."
 
-#: ../data/UpdateManager.glade.h:21
-#, fuzzy
-msgid "_Reload"
-msgstr "重新載入"
-
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
 msgid "<b>Channels</b>"
@@ -591,7 +622,7 @@ msgid "_Check for updates automatically:"
 msgstr "檢查軟體更新間隔："
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
+msgid "_Download updates in the background, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -603,36 +634,47 @@ msgid "     "
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
 #, fuzzy
 msgid "<b>Channel</b>"
 msgstr "<b>金鑰</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>備註:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid "<b>Components:</b>"
+msgstr "<b>元件</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>發行版本:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>分類:</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>分類:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
 msgstr "<b>類型:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
@@ -647,15 +689,15 @@ msgstr ""
 "debian.org sarge main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。"
 
 # (Abel): 「APT 行」實在不倫不類
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT 軟體庫:"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
@@ -663,22 +705,27 @@ msgstr ""
 "可執行檔\n"
 "源程式碼"
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
 msgstr ""
 
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "自選(_C)"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+#, fuzzy
+msgid "_Reload"
+msgstr "重新載入"
+
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr ""
@@ -725,25 +772,25 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.04 'Dapper Drake'"
+msgid "Ubuntu 6.06 'Dapper Drake'"
 msgstr "Ubuntu 5.04 更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.04 Security Updates"
+msgid "Ubuntu 6.06 Security Updates"
 msgstr "Ubuntu 5.04 安全性更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.04 Updates"
+msgid "Ubuntu 6.06 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.04 Backports"
+msgid "Ubuntu 6.06 Backports"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
@@ -769,9 +816,9 @@ msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 更新"
 
 #. CompDescription
-#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#: ../channels/Ubuntu.info.in:128
 #, fuzzy
-msgid "Oficially supported"
+msgid "Officially supported"
 msgstr "官方支援"
 
 #. CompDescription
@@ -828,6 +875,12 @@ msgstr ""
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (不穩定版)"
 
+#. CompDescription
+#: ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "官方支援"
+
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
@@ -838,6 +891,17 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installing updates"
+#~ msgstr "正在安裝軟體更新..."
+
+#, fuzzy
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "由伺服器重新載入套件資料。"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>分類:</b>"
+
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "軟體更新"
@@ -874,9 +938,6 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "日"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>元件</b>"
-
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>軟體庫</b>"
 
@@ -1036,9 +1097,6 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "版本 %s: \n"
 
-#~ msgid "Downloading changes..."
-#~ msgstr "正在下載更改紀錄..."
-
 #~ msgid "There are no updated packages"
 #~ msgstr "沒有任何套件需要更新"
 
@@ -1070,9 +1128,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "正在更新套件清單..."
 
-#~ msgid "Checking for updates..."
-#~ msgstr "正在檢查更新套件..."
-
 #~ msgid "There are no updates available."
 #~ msgstr "沒有任何軟體可以更新。"
 
-- 
cgit v1.2.3


From 6297fce66c8243488048690472f0d1ebc329dd52 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 27 Mar 2006 19:53:07 +0200
Subject: * DistUpgrade/DistUpgrade.glade: fix version information

---
 DistUpgrade/DistUpgrade.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index 8d82b7c5..f6a8041d 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -38,7 +38,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label_title">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Upgrading to Ubuntu &quot;Dapper&quot; 6.04&lt;/span&gt;</property>
+	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Upgrading to Ubuntu &quot;Dapper&quot; 6.06&lt;/span&gt;</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-- 
cgit v1.2.3


From 8001854fbdcd43b63edceb32cb4f3401fb14d8a0 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 27 Mar 2006 22:49:29 +0200
Subject: * wording fix (thanks to BradB)

---
 DistUpgrade/DistUpgradeViewGtk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index b095478c..bd5ee6df 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -107,7 +107,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
             self.status.set_text(_("Downloading file %li of %li at %s/s" % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS))))
             self.progress.set_text(_("%s remaining" % apt_pkg.TimeToStr(self.eta)))
         else:
-            self.status.set_text(_("Downloading file %li of %li at unknown speed" % (currentItem, self.totalItems)))
+            self.status.set_text(_("Downloading file %li of %li" % (currentItem, self.totalItems)))
             self.progress.set_text("  ")
 
         while gtk.events_pending():
-- 
cgit v1.2.3


From 4171544c714a8cdefbd2445b3108be89dc7ab59b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 12:09:01 +0200
Subject: * eta for the install added * better debugging support for the
 DistUpgradeViewGtk

---
 DistUpgrade/DistUpgradeViewGtk.py | 47 +++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index bd5ee6df..a550402f 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -141,6 +141,9 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd,
                     "DEBIAN_FRONTEND=gnome",
                     "APT_LISTCHANGES_FRONTEND=none"]
+        # do a bit of time-keeping
+        self.start_time = 0.0
+        self.time_ui = 0.0
 
     def error(self, pkg, errormsg):
         logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg))
@@ -172,9 +175,12 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.parent.dialog_conffile.set_transient_for(self.parent.window_main)
 
         # now get the diff
-        cmd = ["/usr/bin/diff", "-u", current, new]
-        diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0])
-        self.parent.textview_conffile.get_buffer().set_text(diff)
+        if os.path.exists("/usr/bin/diff"):
+          cmd = ["/usr/bin/diff", "-u", current, new]
+          diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0])
+          self.parent.textview_conffile.get_buffer().set_text(diff)
+        else:
+          self.parent.textview_conffile.get_buffer().set_text(_("The 'diff' command was not found"))
         res = self.parent.dialog_conffile.run()
         self.parent.dialog_conffile.hide()
         # if replace, send this to the terminal
@@ -183,14 +189,31 @@ class GtkInstallProgressAdapter(InstallProgress):
         else:
           self.term.feed_child("n\n")
         
-        
     def fork(self):
         pid = self.term.forkpty(envv=self.env)
         return pid
 
     def statusChange(self, pkg, percent, status):
+        # start the timer when the first package changes its status
+        eta = 0
+        if self.start_time == 0.0:
+          #print "setting start time to %s" % self.start_time
+          self.start_time = time.time()
+        else:
+          delta = time.time() - self.start_time
+          #print "delta: %s (%s - %s) " % (delta, time.time(), self.start_time)
+          #print "percent: %s" % percent
+          eta = (100.0 - percent) * (float(delta)/percent)
+          #print "eta: %s" % eta
+          #print "eta (TimeToStr): %s" % apt_pkg.TimeToStr(eta)
+          #print
         self.progress.set_fraction(float(percent)/100.0)
-        self.label_status.set_text(status.strip())
+        # only show if more than 5s and less than 2 days
+        if eta > 5.0 and eta < (60*60*24*2):
+          status = "%s (%s remaining)" % (status.strip(),apt_pkg.TimeToStr(eta))
+        else:
+          status = status.strip()
+        self.label_status.set_text(status)
 
     def child_exited(self, term, pid, status):
         self.apt_status = os.WEXITSTATUS(status)
@@ -450,10 +473,19 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
 if __name__ == "__main__":
   
   view = DistUpgradeViewGtk()
+  fp = GtkFetchProgressAdapter(view)
   ip = GtkInstallProgressAdapter(view)
+
+
+  cache = apt.Cache()
+  for pkg in sys.argv[1:]:
+    cache[pkg].markInstall()
+  cache.commit(fp,ip)
+  
+  sys.exit(0)
   ip.conffile("TODO","TODO~")
   view.getTerminal().call(["dpkg","--configure","-a"])
-  #view.getTerminal().call(["ls"])
+  view.getTerminal().call(["ls"])
   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"
@@ -463,4 +495,5 @@ if __name__ == "__main__":
              "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)
+  view.confirmChanges("xx",[], 100)
+  
-- 
cgit v1.2.3


From ceedd9449aebce9916e8c7f29640756214f8c37d Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 12:14:27 +0200
Subject: * do a pulse when dpkg initalizes but nothing was installed yet

---
 DistUpgrade/DistUpgradeViewGtk.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index a550402f..1e860c93 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -229,6 +229,9 @@ class GtkInstallProgressAdapter(InstallProgress):
     
     def updateInterface(self):
         InstallProgress.updateInterface(self)
+        if self.start_time == 0.0:
+          self.progress.pulse()
+          time.sleep(0.15)
         while gtk.events_pending():
             gtk.main_iteration()
 	time.sleep(0.02)
-- 
cgit v1.2.3


From 44adfdcf86cf45d4ce62a2de755f747fc3f6e208 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 12:19:40 +0200
Subject: * show the eta in the progresbar

---
 DistUpgrade/DistUpgradeViewGtk.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 1e860c93..93cb8027 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -210,10 +210,10 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.progress.set_fraction(float(percent)/100.0)
         # only show if more than 5s and less than 2 days
         if eta > 5.0 and eta < (60*60*24*2):
-          status = "%s (%s remaining)" % (status.strip(),apt_pkg.TimeToStr(eta))
+          self.progress.set_text(_("%s remaining") % apt_pkg.TimeToStr(eta))
         else:
-          status = status.strip()
-        self.label_status.set_text(status)
+          self.progress.set_text(" ")
+        self.label_status.set_text(status.strip())
 
     def child_exited(self, term, pid, status):
         self.apt_status = os.WEXITSTATUS(status)
@@ -229,6 +229,7 @@ class GtkInstallProgressAdapter(InstallProgress):
     
     def updateInterface(self):
         InstallProgress.updateInterface(self)
+        # check if we haven't started yet with packages, pulse then
         if self.start_time == 0.0:
           self.progress.pulse()
           time.sleep(0.15)
-- 
cgit v1.2.3


From 82f0ab9f1c70ed64dfe5c3512c10e8cb42103c5f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 12:34:21 +0200
Subject: * update the eta based on a UPDATE_HZ value

---
 DistUpgrade/DistUpgradeViewGtk.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 93cb8027..80eb8815 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -115,6 +115,8 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         return True
 
 class GtkInstallProgressAdapter(InstallProgress):
+    UPDATE_HZ = 1
+  
     def __init__(self,parent):
         InstallProgress.__init__(self)
         self.label_status = parent.label_status
@@ -199,20 +201,8 @@ class GtkInstallProgressAdapter(InstallProgress):
         if self.start_time == 0.0:
           #print "setting start time to %s" % self.start_time
           self.start_time = time.time()
-        else:
-          delta = time.time() - self.start_time
-          #print "delta: %s (%s - %s) " % (delta, time.time(), self.start_time)
-          #print "percent: %s" % percent
-          eta = (100.0 - percent) * (float(delta)/percent)
-          #print "eta: %s" % eta
-          #print "eta (TimeToStr): %s" % apt_pkg.TimeToStr(eta)
-          #print
-        self.progress.set_fraction(float(percent)/100.0)
-        # only show if more than 5s and less than 2 days
-        if eta > 5.0 and eta < (60*60*24*2):
-          self.progress.set_text(_("%s remaining") % apt_pkg.TimeToStr(eta))
-        else:
-          self.progress.set_text(" ")
+          self.last_time = self.start_time
+        self.progress.set_fraction(float(self.percent)/100.0)
         self.label_status.set_text(status.strip())
 
     def child_exited(self, term, pid, status):
@@ -233,6 +223,18 @@ class GtkInstallProgressAdapter(InstallProgress):
         if self.start_time == 0.0:
           self.progress.pulse()
           time.sleep(0.15)
+        else:
+          # it started!
+          if (time.time() - self.last_time) > self.UPDATE_HZ:
+            self.last_time = time.time()
+            delta = self.last_time - self.start_time
+            eta = (100.0 - self.percent) * (float(delta)/self.percent)
+            # only show if it is in sensible bounds
+            if eta > 1.0 and eta < (60*60*24*2):
+              self.progress.set_text(_("%s remaining")%apt_pkg.TimeToStr(eta))
+            else:
+              self.progress.set_text(" ")
+            
         while gtk.events_pending():
             gtk.main_iteration()
 	time.sleep(0.02)
-- 
cgit v1.2.3


From f87c00b4aa0cbeba35c3b3bb9f8274b58def1a50 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 12:56:12 +0200
Subject: * added inital startup time data gathering phase

---
 DistUpgrade/DistUpgradeViewGtk.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 80eb8815..2fc0c50b 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -115,7 +115,8 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         return True
 
 class GtkInstallProgressAdapter(InstallProgress):
-    UPDATE_HZ = 1
+    UPDATE_HZ = 2
+    INITIAL_DATA_GATHERING = 15
   
     def __init__(self,parent):
         InstallProgress.__init__(self)
@@ -222,10 +223,11 @@ class GtkInstallProgressAdapter(InstallProgress):
         # check if we haven't started yet with packages, pulse then
         if self.start_time == 0.0:
           self.progress.pulse()
-          time.sleep(0.15)
+          time.sleep(0.2)
         else:
           # it started!
-          if (time.time() - self.last_time) > self.UPDATE_HZ:
+          if (self.start_time + self.INITIAL_DATA_GATHERING) < time.time() and\
+                 (time.time() - self.last_time) > self.UPDATE_HZ:
             self.last_time = time.time()
             delta = self.last_time - self.start_time
             eta = (100.0 - self.percent) * (float(delta)/self.percent)
-- 
cgit v1.2.3


From 7b07d48f2b956a46fe190f5db84e1d65a66a3f3c Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 13:04:13 +0200
Subject: * try a "use-longest-time-so-far" approach

---
 DistUpgrade/DistUpgradeViewGtk.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 2fc0c50b..669918b5 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -116,7 +116,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
 
 class GtkInstallProgressAdapter(InstallProgress):
     UPDATE_HZ = 2
-    INITIAL_DATA_GATHERING = 15
+    INITIAL_DATA_GATHERING = 10
   
     def __init__(self,parent):
         InstallProgress.__init__(self)
@@ -147,7 +147,8 @@ class GtkInstallProgressAdapter(InstallProgress):
         # do a bit of time-keeping
         self.start_time = 0.0
         self.time_ui = 0.0
-
+        self.longest_time_per_percent = 0.0
+        
     def error(self, pkg, errormsg):
         logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg))
         #self.expander_terminal.set_expanded(True)
@@ -230,7 +231,10 @@ class GtkInstallProgressAdapter(InstallProgress):
                  (time.time() - self.last_time) > self.UPDATE_HZ:
             self.last_time = time.time()
             delta = self.last_time - self.start_time
-            eta = (100.0 - self.percent) * (float(delta)/self.percent)
+            time_per_percent = (float(delta)/self.percent)
+            if self.longest_time_per_percent < time_per_percent:
+              self.longest_time_per_percent =  time_per_percent
+            eta = (100.0 - self.percent) * self.longest_time_per_percent
             # only show if it is in sensible bounds
             if eta > 1.0 and eta < (60*60*24*2):
               self.progress.set_text(_("%s remaining")%apt_pkg.TimeToStr(eta))
-- 
cgit v1.2.3


From 8d92e689e345e27a7dbcafccc485fca28977da4b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 17:24:54 +0200
Subject: * simplified that eta calculation again, it turned out that the
 others are crap

---
 DistUpgrade/DistUpgradeViewGtk.py | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 669918b5..01c43051 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -115,9 +115,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         return True
 
 class GtkInstallProgressAdapter(InstallProgress):
-    UPDATE_HZ = 2
-    INITIAL_DATA_GATHERING = 10
-  
+
     def __init__(self,parent):
         InstallProgress.__init__(self)
         self.label_status = parent.label_status
@@ -199,13 +197,21 @@ class GtkInstallProgressAdapter(InstallProgress):
 
     def statusChange(self, pkg, percent, status):
         # start the timer when the first package changes its status
-        eta = 0
         if self.start_time == 0.0:
           #print "setting start time to %s" % self.start_time
           self.start_time = time.time()
-          self.last_time = self.start_time
         self.progress.set_fraction(float(self.percent)/100.0)
         self.label_status.set_text(status.strip())
+        # start showing when we gathered some data
+        if percent > 2.0:
+          delta = time.time() - self.start_time
+          time_per_percent = (float(delta)/percent)
+          eta = (100.0 - self.percent) * time_per_percent
+          # only show if we have some sensible data
+          if eta > 1.0 and eta < (60*60*24*2):
+            self.progress.set_text(_("%s remaining")%apt_pkg.TimeToStr(eta))
+          else:
+            self.progress.set_text(" ")
 
     def child_exited(self, term, pid, status):
         self.apt_status = os.WEXITSTATUS(status)
@@ -225,22 +231,6 @@ class GtkInstallProgressAdapter(InstallProgress):
         if self.start_time == 0.0:
           self.progress.pulse()
           time.sleep(0.2)
-        else:
-          # it started!
-          if (self.start_time + self.INITIAL_DATA_GATHERING) < time.time() and\
-                 (time.time() - self.last_time) > self.UPDATE_HZ:
-            self.last_time = time.time()
-            delta = self.last_time - self.start_time
-            time_per_percent = (float(delta)/self.percent)
-            if self.longest_time_per_percent < time_per_percent:
-              self.longest_time_per_percent =  time_per_percent
-            eta = (100.0 - self.percent) * self.longest_time_per_percent
-            # only show if it is in sensible bounds
-            if eta > 1.0 and eta < (60*60*24*2):
-              self.progress.set_text(_("%s remaining")%apt_pkg.TimeToStr(eta))
-            else:
-              self.progress.set_text(" ")
-            
         while gtk.events_pending():
             gtk.main_iteration()
 	time.sleep(0.02)
-- 
cgit v1.2.3


From 5ce12f95a64150152f859e8497516f2876846dad Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 17:43:41 +0200
Subject: * start showing the progress eta when 1.0 is reached

---
 DistUpgrade/DistUpgradeViewGtk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 01c43051..4ce026c8 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -203,7 +203,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.progress.set_fraction(float(self.percent)/100.0)
         self.label_status.set_text(status.strip())
         # start showing when we gathered some data
-        if percent > 2.0:
+        if percent > 1.0:
           delta = time.time() - self.start_time
           time_per_percent = (float(delta)/percent)
           eta = (100.0 - self.percent) * time_per_percent
-- 
cgit v1.2.3


From dd368277d12fef9b07cc75922ac33c85e8786b95 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 29 Mar 2006 17:57:12 +0200
Subject: * updated with the rosetta po files

---
 po/bg.po              | 350 ++++++++----------
 po/br.po              | 791 +++++++++++++++++++++++++++++++++++++++++
 po/cs.po              | 863 ++++++++++++++++++++++++++++++++++++++++++++
 po/da.po              | 261 ++++++--------
 po/de.po              | 693 +++++++++++++++++-------------------
 po/el.po              | 705 +++++++++++++++++++-----------------
 po/en_CA.po           | 368 ++++++++-----------
 po/en_GB.po           | 356 ++++++++-----------
 po/es.po              | 728 ++++++++++++++++++--------------------
 po/fi.po              | 963 +++++++++++++++++++++++++++-----------------------
 po/fr.po              | 731 ++++++++++++++++++--------------------
 po/gl.po              | 360 ++++++++-----------
 po/he.po              | 368 ++++++++-----------
 po/hu.po              | 697 +++++++++++++++++-------------------
 po/it.po              | 696 +++++++++++++++++-------------------
 po/ja.po              | 406 +++++++++------------
 po/lt.po              | 845 +++++++++++++------------------------------
 po/mk.po              | 453 ++++++++++++------------
 po/nb.po              | 671 +++++++++++++++++------------------
 po/ne.po              | 400 +++++++++------------
 po/nl.po              | 252 +++++--------
 po/pa.po              | 279 ++++++---------
 po/pl.po              | 727 ++++++++++++++++++-------------------
 po/pt.po              | 482 +++++++++++--------------
 po/pt_BR.po           | 564 +++++++++++++----------------
 po/ro.po              | 370 +++++++++----------
 po/rw.po              | 351 ++++++++----------
 po/sk.po              | 807 ++++++++++++++++++++++++++++++++++++++++++
 po/sv.po              | 838 +++++++++++++++++++++----------------------
 po/uk.po              | 483 +++++++++++--------------
 po/update-manager.pot | 853 --------------------------------------------
 po/vi.po              | 349 ++++++++----------
 po/xh.po              | 268 ++++++--------
 po/zh_CN.po           | 595 ++++++++++++++-----------------
 po/zh_HK.po           | 341 +++++++-----------
 po/zh_TW.po           | 338 +++++++-----------
 36 files changed, 9683 insertions(+), 9919 deletions(-)
 create mode 100644 po/br.po
 create mode 100644 po/cs.po
 mode change 100755 => 100644 po/ne.po
 create mode 100644 po/sk.po

diff --git a/po/bg.po b/po/bg.po
index 5adf6549..c75f220f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2005 THE update manager'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the update manager package.
 # Rostislav "zbrox" Raykov <zbrox@i-space.org>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-07-22 19:24+0300\n"
-"Last-Translator: Rostislav \"zbrox\" Raykov <zbrox@i-space.org>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:18+0000\n"
+"Last-Translator: Rostislav Raykov <nostalgiafed@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,29 +27,30 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Грешка при внасяне на избрания файл"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Избраният файл или не е GPG файл или е повреден."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Грешка при премахване на ключа"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
 "грешка."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -57,11 +58,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -83,7 +84,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -95,40 +95,38 @@ msgid ""
 "this as a bug. "
 msgstr ""
 "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
-"грешка."
+"грешка. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
-"грешка."
+"грешка. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -141,7 +139,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -189,205 +186,184 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Друга програма за управление на пакетите е стартирана."
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Обновлението е завършено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Сваляне на промените..."
+msgid "Installing updates"
+msgstr "Инсталиране на обновленията..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
 "грешка."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Ключове</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Инсталиране"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Обновлението е завършено"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -395,11 +371,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -419,8 +394,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -433,51 +408,38 @@ msgid "Details"
 msgstr "<b>Допълнителна информация</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Презареждане"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -510,57 +472,53 @@ msgid "Changes"
 msgstr "Промени"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "Проверка за обновления..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Описание"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Обновления на софтуера"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Инсталиране на обновленията..."
@@ -632,7 +590,7 @@ msgid "_Check for updates automatically:"
 msgstr "Проверка за обновления на всеки"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -641,7 +599,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -663,14 +621,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Компоненти</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Дистрибуция:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Раздели:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -687,14 +644,14 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Добавете пълния ред на хранилището за APT, което искате да добавите</"
-"b></big>\n"
+"<big><b>Добавете пълния ред на хранилището за APT, което искате да "
+"добавите</b></big>\n"
 "\n"
 "APT редът съдържа вида, местонахождението и съдържанието на хранилището. "
 "Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете "
@@ -726,7 +683,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -774,145 +733,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 5.04 обновления"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Ubuntu 5.04 обновления по сигурността"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Ubuntu 5.10 обновления"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Ubuntu 5.10 обновления"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD с Ubuntu 5.10 „Breezy Badger“"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 обновления по сигурността"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 обновления"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 обновления"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Официално поддържан"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Ограничен от правата"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Поддържан от обществото (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Несвободен (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 „Sarge“"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian Stable обновления по сигурността"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian Testing"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Официално поддържан"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Инсталиране на обновленията..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Презареждане от сървъра на информацията за пакетите."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Раздели:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Обновления на софтуера"
@@ -949,6 +878,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ден/дни"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Компоненти</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Хранилище</b>"
 
@@ -966,16 +898,16 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Ключове за идентификация</b></big>\n"
 #~ "\n"
-#~ "Може да добавяте и премахвате ключове за идентификация през този "
-#~ "прозорец. Ключът прави възможна проверката на цялостта на софтуера, който "
-#~ "сваляте от интернет."
+#~ "Може да добавяте и премахвате ключове за идентификация през този прозорец. "
+#~ "Ключът прави възможна проверката на цялостта на софтуера, който сваляте от "
+#~ "интернет."
 
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, "
-#~ "че сте получили ключа по сигурен канал и че можете да се доверите на "
+#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, че "
+#~ "сте получили ключа по сигурен канал и че можете да се доверите на "
 #~ "собственика. "
 
 #~ msgid "Add repository..."
@@ -1003,8 +935,8 @@ msgstr ""
 #~ msgstr "Максимален размер в Мб:"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Възвръщане на стандартните ключове идващи с дистрибуцията. Това няма да "
 #~ "промени потребителските инсталирани ключове."
@@ -1036,13 +968,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "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 "Отказ на свалянето на дневника на промените"
@@ -1131,6 +1063,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Версия %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Сваляне на промените..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "Няма пакети за обновяване"
 
@@ -1145,8 +1080,7 @@ msgstr ""
 #~ msgstr[1] "Избрахте всички %s пакета за обновяване, с общ размер %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ msgid_plural "You have selected %s out of %s updated packages, total size %s"
 #~ msgstr[0] "Избрахте %s от %s пакет за обновяване, с размер %s"
 #~ msgstr[1] "Избрахте %s от %s пакета за обновяване, с общ размер %s"
 
@@ -1154,11 +1088,11 @@ msgstr ""
 #~ msgstr "Обновленията се прилагат."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Може да стартирате само една програма за управление на пакетите. "
-#~ "Затворете другата програма първо."
+#~ "Може да стартирате само една програма за управление на пакетите. Затворете "
+#~ "другата програма първо."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Обновяване на списъка с пакетите..."
@@ -1174,22 +1108,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще "
-#~ "бъдат спрени поправките по сигурността и други критични обновления. Вижте "
+#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще бъдат "
+#~ "спрени поправките по сигурността и други критични обновления. Вижте "
 #~ "http://www.ubuntulinux.org за повече информация."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Има нова версия на Ubuntu!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "Излезнала е нова версия с кодовото име „%s“. Вижте http://www.ubuntulinux."
-#~ "org за информация по обновяването."
+#~ "Излезнала е нова версия с кодовото име „%s“. Вижте "
+#~ "http://www.ubuntulinux.org за информация по обновяването."
 
 #~ msgid "Never show this message again"
 #~ msgstr "Без да се показва това съобщение отново"
@@ -1202,4 +1136,4 @@ msgstr ""
 #~ "connection."
 #~ msgstr ""
 #~ "Неуспех при сваляне на промените. Проверете дали има активна връзка към "
-#~ "интернет."
+#~ "интернет."
\ No newline at end of file
diff --git a/po/br.po b/po/br.po
new file mode 100644
index 00000000..2d2def2c
--- /dev/null
+++ b/po/br.po
@@ -0,0 +1,791 @@
+# Breton translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Breton <br@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:382
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:392
+msgid "Error importing selected file"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:393
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:405
+msgid "Error removing the key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:447
+#, python-format
+msgid ""
+"<big><b>Error scaning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:504
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:520
+msgid "Please insert a disc in the drive:"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:93
+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:135
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:142
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:145
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:146
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:168
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:169
+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:232
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:233
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:240
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:241
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:108
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:125
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:171
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:172
+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:191
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:192
+#, python-format
+msgid ""
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:198
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:214
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:215
+msgid ""
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:230
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:274
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:281
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:282
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:311
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:325
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:329
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:336
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:341
+msgid "System upgrade is complete."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#, python-format
+msgid "Downloading file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#, python-format
+msgid "Downloading file %li of %li at unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+msgid "The upgrade aborts now. Please report this bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+msgid ""
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#, python-format
+msgid "%s package is going to be removed."
+msgid_plural "%s packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#, python-format
+msgid "%s new package is going to be installed."
+msgid_plural "%s new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#, python-format
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+msgid "Could not find any upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+msgid "Your system has already been upgraded."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:68
+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)
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.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 ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Downloading and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../data/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 \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Check for available updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Show details"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:14
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:17
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:18
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:19
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid "     "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Channel</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
+msgid "<b>Sections</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
+msgid "_Add Channel"
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
+msgid "_Custom"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+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 ""
+"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 ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:6
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:23
+msgid "Ubuntu 6.04 Security Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:40
+msgid "Ubuntu 6.04 Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:57
+msgid "Ubuntu 6.04 Backports"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:108
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:125
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:131
+msgid "Restricted copyright"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:134
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:137
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
\ No newline at end of file
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 00000000..6008dd87
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,863 @@
+# Czech 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: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-26 19:43+0000\n"
+"Last-Translator: Texis <tomas@ciganek.cz>\n"
+"Language-Team: Czech <cs@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:104
+#, python-format
+msgid "Every %s days"
+msgstr "Každých %s dní"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+#, python-format
+msgid "After %s days"
+msgstr "Po %s dnech"
+
+#: ../SoftwareProperties/SoftwareProperties.py:382
+msgid "Import key"
+msgstr "Importovat klíč"
+
+#: ../SoftwareProperties/SoftwareProperties.py:392
+msgid "Error importing selected file"
+msgstr "Chyba při importování vybraného souboru"
+
+#: ../SoftwareProperties/SoftwareProperties.py:393
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr "Vybraný soubor nemusí obsahovat GPG klíč nebo může být porušen."
+
+#: ../SoftwareProperties/SoftwareProperties.py:405
+msgid "Error removing the key"
+msgstr "Chyba při odstraňování klíče"
+
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+"Vybraný klíč nemohl být odstraněn. Prosim nahlašte tento problém jako chybu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:447
+#, python-format
+msgid ""
+"<big><b>Error scaning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+"<big><b>Chyba při načítání CD</b></big>\n"
+"\n"
+"%s"
+
+#: ../SoftwareProperties/SoftwareProperties.py:504
+msgid "Please enter a name for the disc"
+msgstr "Prosím zadejte jméno disku"
+
+#: ../SoftwareProperties/SoftwareProperties.py:520
+msgid "Please insert a disc in the drive:"
+msgstr "Prosím vložte disk do mechaniky:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+msgid "Broken packages"
+msgstr "Poškozené balíky"
+
+#: ../DistUpgrade/DistUpgradeCache.py:93
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:135
+msgid "Can't upgrade required meta-packages"
+msgstr "Nemohu upgradovat požadované meta-balíky"
+
+#: ../DistUpgrade/DistUpgradeCache.py:142
+msgid "A essential package would have to be removed"
+msgstr "Základní balík by musel být odstraněn"
+
+#: ../DistUpgrade/DistUpgradeCache.py:145
+msgid "Could not calculate the upgrade"
+msgstr "Nemohu vypočítat upgrade"
+
+#: ../DistUpgrade/DistUpgradeCache.py:146
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"Při výpočtu upgradu nastal neřešitelný problém. Prosím oznamte to jako "
+"chybu. "
+
+#: ../DistUpgrade/DistUpgradeCache.py:168
+msgid "Error authenticating some packages"
+msgstr "Chyba při ověření některých balíků"
+
+#: ../DistUpgrade/DistUpgradeCache.py:169
+msgid ""
+"It was not possible to authenticate some packages. This may be a transient "
+"network problem. You may want to try again later. See below for a list of "
+"unauthenticated packages."
+msgstr ""
+"Nebylo možné ověřit nekteré balíky. To může být způsobeno přechodným "
+"problémem v síti. Možná to budete chtít zkusit později. Níže je uveden "
+"seznam neověřených balíků."
+
+#: ../DistUpgrade/DistUpgradeCache.py:232
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Nemohu nainstalovat '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:233
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. "
+
+#: ../DistUpgrade/DistUpgradeCache.py:240
+msgid "Can't guess meta-package"
+msgstr "Nemohu odhadnout meta-balík"
+
+#: ../DistUpgrade/DistUpgradeCache.py:241
+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 ""
+"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ů "
+"pomocí synaptic nebo apt-get."
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr "Probíhá čtení cache"
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "No valid entry found"
+msgstr "Nenalezena žádná platná položka"
+
+#: ../DistUpgrade/DistUpgradeControler.py:108
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+"Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka pro "
+"upgrade.\n"
+
+#: ../DistUpgrade/DistUpgradeControler.py:125
+msgid "Repository information invalid"
+msgstr "Neplatná informace zdroje"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+"Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako "
+"chybu."
+
+#: ../DistUpgrade/DistUpgradeControler.py:171
+msgid "Error during update"
+msgstr "Chyba během aktualizace"
+
+#: ../DistUpgrade/DistUpgradeControler.py:172
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+"Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového "
+"připojení. Prosím zkontrolujte své připojení a zkuste to znovu."
+
+#: ../DistUpgrade/DistUpgradeControler.py:191
+msgid "Not enough free disk space"
+msgstr "Nedostatek volného místa na disku"
+
+#: ../DistUpgrade/DistUpgradeControler.py:192
+#, python-format
+msgid ""
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
+msgstr ""
+"Upgrade byl předčasně ukončen. Prosím uvolněte alespoň %s místa na disku. "
+"Vyprázdněte koš a odstraňte"
+
+#: ../DistUpgrade/DistUpgradeControler.py:198
+msgid "Do you want to start the upgrade?"
+msgstr "Chcete spustit upgrade?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:214
+msgid "Could not install the upgrades"
+msgstr "Nelze nainstalovat upgrady"
+
+#: ../DistUpgrade/DistUpgradeControler.py:215
+msgid ""
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
+msgstr ""
+"Upgrade byl předčasně ukončen. 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:230
+msgid "Could not download the upgrades"
+msgstr "Nelze stáhnout upgrady"
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+"Upgrade byl předčasně ukončen. Prosím zkontrolujte si připojení k internetu "
+"nebo instalační médium a zkuste to znovu. "
+
+#: ../DistUpgrade/DistUpgradeControler.py:274
+msgid "Remove obsolete Packages?"
+msgstr "Odstranit zastaralé balíky?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:281
+msgid "Error during commit"
+msgstr "Chyba při zaznamenávání"
+
+#: ../DistUpgrade/DistUpgradeControler.py:282
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+"Během čištění nastal nějaký problém. Pro více informací si prosím "
+"prohléhněte níže uvedenou zprávu. "
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
+msgid "Checking package manager"
+msgstr "Kontroluje se manažer balíků"
+
+#: ../DistUpgrade/DistUpgradeControler.py:311
+msgid "Updating repository information"
+msgstr "Aktualizují se informace o úložišti"
+
+#: ../DistUpgrade/DistUpgradeControler.py:325
+msgid "Asking for confirmation"
+msgstr "Požaduje se potvrzení"
+
+#: ../DistUpgrade/DistUpgradeControler.py:329
+msgid "Upgrading"
+msgstr "Probíhá upgrade"
+
+#: ../DistUpgrade/DistUpgradeControler.py:336
+msgid "Searching for obsolete software"
+msgstr "Vyhledáván zastaralý software"
+
+#: ../DistUpgrade/DistUpgradeControler.py:341
+msgid "System upgrade is complete."
+msgstr "Upgrade systému je dokončen."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr "Prosím vložte '%s' do mechaniky '%s'"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+msgid "Download is complete"
+msgstr "Stahování bylo dokončeno"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#, python-format
+msgid "Downloading file %li of %li at %s/s"
+msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#, python-format
+msgid "%s remaining"
+msgstr "%s zbývá"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#, python-format
+msgid "Downloading file %li of %li at unknown speed"
+msgstr "Stahuji soubor %li z %li neznámou rychlostí"
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Instaluji aktualizace"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#, python-format
+msgid "Could not install '%s'"
+msgstr "Nelze nainstalovat '%s'"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+msgid "The upgrade aborts now. Please report this bug."
+msgstr "Upgrade byl předčasně ukončen. Prosím oznamte to jako chybu"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+msgid "A fatal error occured"
+msgstr "Nastala fatální chyba"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+msgid ""
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
+msgstr ""
+"Prosím oznamte to jako chybu a do zprávy připojte soubory ~/dist-upgrade.log "
+"a ~/dist-upgrade-apt.log. Upgrade byl předčasně ukončen. "
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#, python-format
+msgid "%s package is going to be removed."
+msgid_plural "%s packages are going to be removed."
+msgstr[0] "%s balík bude odstraněn."
+msgstr[1] "%s balíky budou odstraněny."
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#, python-format
+msgid "%s new package is going to be installed."
+msgid_plural "%s new packages are going to be installed."
+msgstr[0] "%s nový balík bude nainstalován."
+msgstr[1] "%s nové balíky budou nainstalovány."
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#, python-format
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] "%s balík bude upgradován."
+msgstr[1] "%s balíky budou upgradovány."
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#, python-format
+msgid "You have to download a total of %s."
+msgstr "Bude staženo celkem %s."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+msgid "Could not find any upgrades"
+msgstr "Žádné upgrady nebyly nalezeny."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+msgid "Your system has already been upgraded."
+msgstr "Váš systém byl již upgradován."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr "<b>Odstranit %s</b>"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
+msgid "Install %s"
+msgstr "Nainstalovat %s"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
+msgid "Upgrade %s"
+msgstr "Upgradovat %s"
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid "Reboot required"
+msgstr "Je třeba restartovat"
+
+#: ../DistUpgrade/DistUpgradeView.py:68
+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í?"
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.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>Zrušit probíhající upgrade?</big></b>\n"
+"\n"
+"Systém muže být v nepoužitelném stavu jestliže upgrade zrušíte. Je silně "
+"doporučeno pokračovat v upgrade."
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr "<b><big>Pro dokončení upgradu restartujte systém</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr "<b><big>Spustit upgrade?</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Upgraduje se na Ubuntu \"Dapper\" "
+"6.04</span>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr "Probíhá čištění"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr "Detaily"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Downloading and installing the upgrades"
+msgstr "Stahují a instalují se upgrady"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Modifying the software channels"
+msgstr "Modifikují se programové kanály."
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Preparing the upgrade"
+msgstr "Připravuje se upgrade"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Restarting the system"
+msgstr "Systém se restartuje"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Terminal"
+msgstr "Terminál"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Upgrading Ubuntu"
+msgstr "Upgraduje se Ubuntu"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Report Bug"
+msgstr "_Oznámit chybu"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Restart Now"
+msgstr "_Restartovat nyní"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Resume Upgrade"
+msgstr "_Pokračovat v upgradu"
+
+#: ../data/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 \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+"<b><big>Musíte zkontrolovat aktualizace manuálně</big></b>\n"
+"\n"
+"Váš systéme nezjišťuje nové aktualizace automaticky. Nastavení můžete změnit "
+"v \"Systém\" -> \"Správa\" -> \"Vlastnosti Software\""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+"<big><b>Zjišťují se dostupné aktualizace</b></big>\n"
+"\n"
+"Aktualizace softwaru může opravit chyby, eliminovat bezpečnostní rizika a "
+"poskytnout Vám nové možnosti."
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr "<big><b>Udržujte Váš systém aktuální</b></big>"
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr "Přerušit _stahování"
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr "Změny"
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Check for available updates"
+msgstr "Zkontrolovat dostupné aktualizace"
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Description"
+msgstr "Popis"
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr "Poznámky k vydáni"
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Show details"
+msgstr "Zobrazit detaily"
+
+#: ../data/UpdateManager.glade.h:14
+msgid "Show progress of single files"
+msgstr "Zobrazit průběh stahování jednotlivých souborů"
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Software Updates"
+msgstr "Aktualizace softwaru"
+
+#: ../data/UpdateManager.glade.h:16
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+"Aktualizace softwaru může opravit chyby, eliminovat bezpečnostní rizika a "
+"poskytnout Vám nové možnosti."
+
+#: ../data/UpdateManager.glade.h:17
+msgid "U_pgrade"
+msgstr "U_pgrade"
+
+#: ../data/UpdateManager.glade.h:18
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr "Upgradovat na poslední verzi Ubuntu"
+
+#: ../data/UpdateManager.glade.h:19
+msgid "_Check"
+msgstr "_Zkontrolovat"
+
+#: ../data/UpdateManager.glade.h:20
+msgid "_Hide this information in the future"
+msgstr "_Nezobrazovat příště tyto informace"
+
+#: ../data/UpdateManager.glade.h:21
+msgid "_Install Updates"
+msgstr "Na_instalovat Aktualizace"
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr "<b>Zdroje</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr "<b>Síťové aktualizace</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Klíče</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr "Přidat _Cdrom"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Ověření"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr "_Smazat stažené soubory programů:"
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr "Importovat veřejný klíč od důvěryhodného poskytovate softwaru"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Instalační Medium"
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr "Síťové aktualizace"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+"Automaticky budou nainstalovány pouze aktualizace z oficiálních serverů "
+"Ubuntu. Je tedy třeba nainstalovat i balík \"unattended-upgrades\""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr "Obnovit _Původní"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr "Obnovit původní klíče vaší distribuce"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Předvolby software"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr "_Zkontrolovat aktualizace automaticky"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Stáhnout aktualizace na pozadí, ale neinstalovat je."
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid "     "
+msgstr "     "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+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>Informace ze zdroje jsou zastaralé</big></b>\n"
+"\n"
+"K instalaci software a aktualizací je třeba obnovit informace zdroje z nově "
+"přidaných nebo změněných zdrojů. \n"
+"\n"
+"Pro pokračování je třeba funkční připojení k internetu."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Channel</b>"
+msgstr "<b>Zdroje</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Comment:</b>"
+msgstr "<b>Komentář:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Distribution:</b>"
+msgstr "<b>Distribuce:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sekce:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
+msgid "<b>Sections</b>"
+msgstr "<b>Sekce</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "<b>Type:</b>"
+msgstr "<b>Typ:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "<b>URI:</b>"
+msgstr "<b>Adresa:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Zadejt kompletní APT cestu ke zdroji, který chcete přidat</b></big>\n"
+"\n"
+"APT cesta obsahuje typ, umístění a sekci zdroje, např. <i>\"deb "
+"http://ftp.debian.org sarge main\"</i>."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "APT line:"
+msgstr "APT řádek:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "Add Channel"
+msgstr "Přidat zdroj"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binární\n"
+"Zdroj"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
+msgid "Edit Channel"
+msgstr "Editvat zdroj"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
+msgid "Scanning CD-ROM"
+msgstr "Prohledávám CD-ROM"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
+msgid "_Add Channel"
+msgid_plural "_Add Channels"
+msgstr[0] "Přidat _Zdroj"
+msgstr[1] "Přidat _Zdroje"
+msgstr[2] ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
+msgid "_Custom"
+msgstr "_Uživatelský"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr "_Obnovit"
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr "Zobrazit a nainstalovat dostupné aktualizace"
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr "Spávce Aktualizací"
+
+#: ../data/update-manager.schemas.in.h:1
+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 ""
+"Pokud je automatická kontrola aktualizací zakázána, musíte obnovit seznam "
+"zdrojů ručne. Tato volba umožní ukrytí upomínky zobrazované v takovém "
+"případě."
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr "Připomenout obnovení seznamu zdrojů"
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr "Zobrazit detaily aktualizace"
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr "Uchovává velikost dialogu update-manageru"
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr "Velikost okna"
+
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+
+#: ../channels/Ubuntu.info.in:6
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
+
+#: ../channels/Ubuntu.info.in:23
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 Bezpečnostní Aktualizace"
+
+#: ../channels/Ubuntu.info.in:40
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 Aktualizace"
+
+#: ../channels/Ubuntu.info.in:57
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 Backports"
+
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
+
+#: ../channels/Ubuntu.info.in:108
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Aktualizace"
+
+#: ../channels/Ubuntu.info.in:125
+msgid "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.10 Backports"
+
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
+msgstr "Oficiálně podporováno"
+
+#: ../channels/Ubuntu.info.in:131
+msgid "Restricted copyright"
+msgstr "Omezeno copyrightem"
+
+#: ../channels/Ubuntu.info.in:134
+msgid "Community maintained (Universe)"
+msgstr "Udržováno komunitou (Universe)"
+
+#: ../channels/Ubuntu.info.in:137
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#: ../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"
+
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 \"Sarge\""
+
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr "http://security.debian.org/"
+
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr "Debian 3.1 \"Sarge\" Bezpoečnostní Aktualizace"
+
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr "Debian \"Etch\" (testing)"
+
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr "http://http.us.debian.org/debian/"
+
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr "Debian \"Sid\" (unstable)"
+
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr "Oficiálně podporované"
+
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr "Žádný DFSG kompatibilní  Software"
\ No newline at end of file
diff --git a/po/da.po b/po/da.po
index d984ffc1..2c06b172 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,3 +1,22 @@
+# Danish translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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:104
 #, python-format
 msgid "Every %s days"
@@ -8,27 +27,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -36,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -62,7 +82,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -73,35 +92,33 @@ msgid ""
 "this as a bug. "
 msgstr ""
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -114,7 +131,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -161,199 +177,178 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-msgid "Applying changes"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -361,7 +356,6 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
@@ -385,8 +379,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -398,50 +392,38 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -474,56 +456,52 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
 msgstr ""
 
@@ -587,7 +565,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -617,11 +595,11 @@ msgid "<b>Comment:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-msgid "<b>Components:</b>"
+msgid "<b>Distribution:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-msgid "<b>Distribution:</b>"
+msgid "<b>Sections:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
@@ -638,8 +616,8 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -669,7 +647,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -716,119 +696,96 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 msgid "Officially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr ""
\ No newline at end of file
diff --git a/po/de.po b/po/de.po
index fe00df99..90733031 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the update-manager package.
 # Initial version by an unknown artist.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
-# 
+#
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2006-03-10 17:54+0100\n"
-"Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 11:00+0000\n"
+"Last-Translator: Julian Turner <julian.turner@gmx.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"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
@@ -27,31 +28,32 @@ msgstr "Alle %s Tage"
 msgid "After %s days"
 msgstr "Nach %s Tagen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr "Schlüssel importieren"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Fehler beim Importieren der gewählten Datei"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
-"Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist "
+"Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder "
 "beschädigt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Fehler beim Entfernen des Schlüssels"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
+"Der ausgewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
 "hierfür einen Fehlerbericht."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -62,78 +64,79 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr "Bitte geben Sie einen Namen für die CD ein"
+msgstr "Geben Sie einen Namen für das Medium ein"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr "Bitte legen Sie die CD in das Laufwerk"
+msgstr "Bitte legen Sie ein Medium in das Laufwerk"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Kaputte Pakete"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 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 ""
+"Ihr System enhält kaputte Pakete, die nicht mit dieser Software repariert "
+"werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor "
+"Sie fortfahren."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Kann die benötigten Metapakete nicht aktualisieren"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Ein wichtiges Paket müsste entfernt werden"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Konnte die Aktualisierung nicht ausrechnen"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
-"hierfür einen Fehlerbericht."
+"Ein unlösbares Problem trat beim Ausrechnen der Aktualisierung auf. Bitte "
+"erstellen Sie hierfür einen Fehlerbericht. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Fehler beim Authentifizieren einiger Pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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 ""
+"Einige Pakete konnten nicht authentifiziert werden. Dies kann an "
+"vorübergehenden Netzwerkproblemen liegen. Bitte probieren Sie es später noch "
+"einmal. Die unten stehenden Pakete konnten nicht authentifiziert werden:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Kann ›%s‹ nicht installieren"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
-"hierfür einen Fehlerbericht."
+"Ein notwendiges Paket konnte nicht installiert werden. Bitte erstellen Sie "
+"hierfür einen Fehlerbericht. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Kann kein Meta-Paket erraten"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -141,46 +144,55 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Ihr System enhält kein ›ubuntu-desktop‹-, ›kubuntu-desktop‹- oder ›edubuntu-"
+"desktop‹-Paket, daher konnte Ihre Ubuntu-Version nicht erkannt werden.\n"
+" Bitte installieren Sie eines der obigen Pakete über Synaptic oder apt-get, "
+"bevor Sie fortfahren."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Lese Speicher"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Kein gültiger Eintrag gefunden"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Beim Lesen ihrer Kanalliste konnte kein gültiger Eintrag für die "
+"Aktualisierung gefunden werden.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Ungültige Kanallisteninformationen"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Das Aktualisieren der Quelliste ergab eine ungültige Datei. Bitte erstellen "
+"Sie hierfür einen Fehlerbericht."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Fehler beim Entfernen des Schlüssels"
+msgstr "Fehler beim Aktualisieren"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Bei der Aktualisierung trat ein Problem auf. Dies ist normalerweise auf "
+"Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre "
+"Netzwerkverbindung und versuchen Sie es noch einmal."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Nicht genug Platz auf der Festplatte verfügbar"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -189,223 +201,215 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Die Aktualisierung wird jetzt abgebrochen. Bitte leeren Sie mindestens %s 
\n"
+"Festplattenplatz. Leeren Sie ihren Mülleimer und entfernen Sie temporäre "
+"Pakete von vorherigen Installationen mit ›sudo apt-get clean‹."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Möchten Sie die Aktualisierung starten?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Konnte die Aktualisierungen nicht installieren"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Die Aktualisierung wird jetzt abgebrochen. Bitte versuchen Sie, Ihr System "
+"mit ›sudo apt-get install -f‹ oder Synaptic zu reparieren."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Konnte die Aktualisierungen nicht herunterladen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Die Aktualisierung wird jetzt abgebrochen. Bitte überprüfen Sie Ihre "
+"Verbindung zum Internet oder Ihr Installationsmedium und versuchen Sie es "
+"noch einmal. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Veraltete Pakete entfernen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Fehler beim Anwenden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Ein Problem trat beim Aufräumen auf. Bitte lesen Sie die untenstehende "
+"Nachricht für mehr Informationen. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Ein andere Paketverwaltung läuft bereits"
+msgstr "Paketmanager wird überprüft"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Aktualisiere Paketquellen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Frage nach Bestätigung"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Aktualisierung fertiggestellt"
+msgstr "Aktualisiere"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Suche nach veralteter Software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Aktualisierung abgeschlossen."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Bitte legen Sie das Medium ›%s‹ in das Laufwerk ›%s‹"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Herunterladen abgeschlossen"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Lade Datei %li von %li mit %s/s herunter"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s verbleiben"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Lade Datei %li von %li mit unbekannter Geschwindigkeit herunter"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Änderungen werden heruntergeladen..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Aktualisierungen werden installiert"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Konnte ›%s‹ nicht installieren"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
-"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
-"hierfür einen Fehlerbericht."
+"Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür einen "
+"Fehlerbericht."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Ein fataler Fehler ist aufgetreten"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Bitte erstellen Sie einen Fehlerbericht und schließen Sie die Dateien ~/dist-"
+"upgrade.log und ~/dist-upgrade-apt.log in Ihren Bericht ein. Die "
+"Aktualisierung wird jetzt abgebrochen. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s Paket wird entfernt."
+msgstr[1] "%s Pakete werden entfernt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s neues Paket wird installiert."
+msgstr[1] "%s neue Pakete werden installiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s Paket wird aktualisiert."
+msgstr[1] "%s Pakete werden aktualisiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Insgesamt müssen %s heruntergeladen werden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"Die Aktualisierung kann mehrere Stunden dauern und kann später nicht mehr "
+"abgebrochen werden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Schließen Sie alle offenen Anwendungen und Dokumente, um Datenverlust zu "
+"vermeiden."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Konnte keine Aktualisierungen finden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Das System enthält defekte Pakete!"
+msgstr "Ihr System wurde schon aktualisiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Details</b>"
+msgstr "<b>Entferne %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Installieren"
+msgstr "Installiere %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Aktualisierung fertiggestellt"
+msgstr "Aktualisiere %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Neustart erforderlich"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Die Aktualisierung ist abgeschlossen und ein Neustart ist erforderlich. "
+"Möchten Sie den Computer jetzt neu starten?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -414,81 +418,71 @@ 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>Die laufende Aktualisierung abbrechen?</big></b>\n"
+"\n"
+"Das System könnte in einem unbenutzbaren Zustand verbleiben. Es ist sehr "
+"empfehlenswert, die Aktualisierung fortzusetzen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Starte das System neu, um die Aktualisierung abzuschließen</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Aktualisierung starten?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
-#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ubuntu wird aktualisiert</span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Aktualisiere auf Ubuntu ›Dapper‹ "
+"6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Räume auf"
 
 #: ../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 ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Lade Aktualisierungen herunter und installiere"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Verändere Software-Kanäle"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Bereite die Aktualisierung vor"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Starte das System neu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
+msgstr "Aktualisiere Ubuntu"
 
-# »Aktualisieren« könnte hier verwirrend sein -fa-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Neu laden"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Fehlerbericht erstellen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Neu starten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Aktualisierung fertiggestellt"
+msgstr "_Aktualisierung fortsetzen"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -505,79 +499,79 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Suche nach verfügbaren Aktualisierungen</b></big>\n"
+"\n"
+"Software-Aktualisierungen können Fehler korrigieren, Sicherheitslücken "
+"stopfen und Ihnen neue Funktionen bieten."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Halten Sie Ihr System aktuell</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "_Herunterladen abbrechen"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Änderungen"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Nach verfügbaren Aktualisierungen suchen"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Notizen zur Veröffentlichung"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Details zeigen"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Fortschritt der einzelnen Dateien anzeigen"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Software-Aktualisierungen"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Software-Aktualisierungen können Fehler korrigieren, Sicherheitslücken "
+"stopfen und Ihnen neue Funktionen anbieten."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "Aktualisierung fertiggestellt"
+msgstr "_Aktualisieren"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Aus die neueste Version von Ubuntu aktualisieren"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Prüfen"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "Diese Information in Zukunft _verstecken"
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Installieren"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Details</b>"
+msgstr "<b>Kanäle</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
 #, fuzzy
@@ -585,9 +579,8 @@ msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-Aktualisierungen</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Details</b>"
+msgstr "<b>Schlüssel</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 #, fuzzy
@@ -595,29 +588,26 @@ msgid "Add _Cdrom"
 msgstr "_CD hinzufügen"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
 msgstr "A_uthentifizierung"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Heruntergeladene Paketdateien _löschen:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
 msgstr ""
-"Den gewählten Schlüssel aus dem vertrauenswürdigen Schlüsselbund entfernen."
+"Den öffentlichen Schlüssel einer vertrauenswürdigen Software-Quelle "
+"importieren"
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Aktualisierungen werden installiert..."
+msgstr "Installationsmedien"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Internet-Aktualisierungen</b>"
+msgstr "Internet-Aktualisierungen"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -625,15 +615,17 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Nur Sicherheitsaktualisierungen von den offiziellen Ubuntu-Servern werden "
+"automatisch installiert. Dafür muss das Paket ›unattended-upgrades‹ "
+"installiert werden."
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
 msgstr "Vorgabeschlüssel wiederherstellen"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Auf die Standardschlüssel Ihrer Distribution zurücksetzen"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -644,16 +636,17 @@ msgid "_Check for updates automatically:"
 msgstr "_Automatisch auf Aktualisierungen überprüfen:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
+"Aktualisierungen _nur im Hintergrund herunterladen, aber nicht installieren"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "Sicherheitsaktualisierungen ohne Bestätigung _installieren"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -664,29 +657,32 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>The Kanal-Informationen sind veraltet</big></b>\n"
+"\n"
+"Sie müssen die Kanal-Informationen neu laden, um Software und "
+"Aktualisierungen von neuen oder geänderten Kanälen installieren zu können. \n"
+"\n"
+"Sie brauchen ein laufende Internetverbindung, um fortzufahren."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Details</b>"
+msgstr "<b>Kanal</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Komponenten</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sparten:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Sektionen:</b>"
+msgstr "<b>Sparten:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -697,15 +693,14 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Geben Sie die vollständige APT-Zeile für das Repository ein, welches "
+"<big><b>Geben Sie die vollständige APT-Zeile für den Kanal ein, der "
 "hinzugefügt werden soll</b></big>\n"
 "\n"
 "Die APT-Zeile enthält den Typ, den Ort und den Inhalt der Paketquelle, z.B. "
@@ -734,25 +729,25 @@ msgstr "Kanal bearbeiten"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "CD wird eingelesen"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "Kanal _hinzufügen"
+msgstr[1] "Kanäle _hinzufügen"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
-# »Aktualisieren« könnte hier verwirrend sein -fa-
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Neu laden"
+msgstr "_Neu laden"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Verfügbare Aktualisierungen anzeigen und installieren"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -770,7 +765,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "An das Laden der Kanal-Liste erinnern"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
@@ -785,170 +780,132 @@ msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Speichert den Zustand des Expanders, der die Liste der Änderungen und die "
+"Beschreibung enthält"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
 msgstr "Die Fenstergröße"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.06 ›Dapper Drake‹"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.06 Sicherheitsaktualisierungen"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.06 Aktualisierungen"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.06 Backports"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgstr "Ubuntu 5.10 ›Breezy Badger‹"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgstr "Ubuntu 5.10 Aktualisierungen"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgstr "Ubuntu 5.10 Backports"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Offiziell unterstützt"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Urheberrechtlich eingeschränkt"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Von der Gemeinschaft betreut (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Unfrei (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 ›Sarge‹"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable Sicherheitsaktualisierungen"
+msgstr "Debian 3.1 ›Sarge‹ Sicherheitsaktualisierungen"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian ›Etch‹ (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian ›Sid‹ (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Offiziell unterstützt"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Aktualisierungen werden installiert..."
+msgstr "Nicht DFSG-kompatible Software"
 
-#, fuzzy
 #~ msgid "Reload the latest information about updates"
-#~ msgstr "Aktuelle Paketinformationen vom Server beziehen."
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sparten:</b>"
+#~ msgstr "Aktuelle Paketinformationen vom Server beziehen"
 
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Software-Aktualisierungen"
 
 #~ msgid "Add the following software channel?"
-#~ msgstr "Die folgenden Software-Kanäle hinzufügen?"
+#~ msgid_plural "Add the following software channels?"
+#~ msgstr[0] "Die folgenden Software-Kanäle hinzufügen?"
+#~ msgstr[1] ""
 
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 #~ "\n"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Änderungen werden heruntergeladen</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">Änderungen werden "
+#~ "heruntergeladen</span>\n"
 #~ "\n"
 #~ "Die Änderungen müssen vom zentralen Server abgerufen werden"
 
 #~ msgid "Show available updates and choose which to install"
-#~ msgstr ""
-#~ "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen"
+#~ msgstr "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen"
 
 #, fuzzy
 #~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
@@ -979,14 +936,16 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Verfügbare Aktualisierungen</b></big>\n"
 #~ "\n"
-#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung "
-#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen "
-#~ "werden."
+#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann "
+#~ "durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Komponenten</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
@@ -1015,18 +974,18 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "Hinzufügen einer neuen Schlüsseldatei zum vertrauenswürdigen "
-#~ "Schlüsselbund. Stellen Sie sicher, dass der Schlüssel über eine sichere "
-#~ "Verbindung bezogen wurde und dass der Besitzer vertrauenswürdig ist."
+#~ "Hinzufügen einer neuen Schlüsseldatei zum vertrauenswürdigen Schlüsselbund. "
+#~ "Stellen Sie sicher, dass der Schlüssel über eine sichere Verbindung bezogen "
+#~ "wurde und dass der Besitzer vertrauenswürdig ist. "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "_Temporäre Paketdateien automatisch löschen"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "Säuberungsintervall in Tagen:"
+#~ msgstr "Säuberungsintervall in Tagen: "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "_Alte Pakete aus dem Zwischenspeicher entfernen"
@@ -1042,12 +1001,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Zurücksetzen der Vorgabeschlüssel, welche mit der Distribution "
-#~ "ausgeliefert wurden. Vom Benutzer installierte Schlüssel werden dadurch "
-#~ "nicht geändert."
+#~ "Zurücksetzen der Vorgabeschlüssel, welche mit der Distribution ausgeliefert "
+#~ "wurden. Vom Benutzer installierte Schlüssel werden dadurch nicht geändert."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "_Begrenzen der Größe des Paketzwischenspeichers"
@@ -1072,8 +1030,8 @@ msgstr ""
 #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
 #~ msgstr ""
 #~ "Dies bedeutet, dass einige Abhängigkeiten der installierten Pakete nicht "
-#~ "aufgelöst sind. Verwenden Sie bitte »Synaptic« oder »apt-get« zur "
-#~ "Behebung des Problems."
+#~ "aufgelöst sind. Verwenden Sie bitte »Synaptic« oder »apt-get« zur Behebung "
+#~ "des Problems."
 
 #~ msgid "It is not possible to upgrade all packages."
 #~ msgstr "Es ist nicht möglich, alle Pakete zu aktualisieren."
@@ -1081,13 +1039,12 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "Dies bedeutet, dass neben der momentanen Aktualisierung der Pakete "
-#~ "weitere Aktionen, wie das Installieren oder Entfernen von Paketen, "
-#~ "notwendig sind. Verwenden Sie bitte die »Intelligente Aktualisierung« von "
-#~ "Synaptic oder »apt-get dist-upgrade« zur Behebung des Problems."
+#~ "Dies bedeutet, dass neben der momentanen Aktualisierung der Pakete weitere "
+#~ "Aktionen, wie das Installieren oder Entfernen von Paketen, notwendig sind. "
+#~ "Verwenden Sie bitte die »Intelligente Aktualisierung« von Synaptic oder »apt-"
+#~ "get dist-upgrade« zur Behebung des Problems."
 
 #~ msgid "The following packages are not upgraded: "
 #~ msgstr "Die folgenden Pakete wurden nicht aktualisiert: "
@@ -1107,12 +1064,15 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Änderungen werden heruntergeladen..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Die Aktualisierungen werden ausgeführt."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Es kann immer nur eine Anwendung zur Paketverwaltung zur gleichen Zeit "
 #~ "ausgeführt werden. Bitte beenden Sie zuerst die andere Anwendung."
@@ -1134,20 +1094,20 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Verwenden Sie bitte eine aktuellere Version von Ubuntu-Linux. Für die "
 #~ "momentan laufende Version werden keine Sicherheits- und andere kritische "
-#~ "Aktualisierungen mehr bereitgestellt. Informationen zur "
-#~ "Systemaktualisierung finden Sie unter http://www.ubuntulinux.org."
+#~ "Aktualisierungen mehr bereitgestellt. Informationen zur Systemaktualisierung "
+#~ "finden Sie unter http://www.ubuntulinux.org."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Eine neue Version von Ubuntu ist verfügbar!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
 #~ "Eine neue Version mit dem Codenamen »%s« ist verfügbar. Informationen zur "
 #~ "Aktualisierung des Systems erhalten Sie unter http://www.ubuntulinux.org."
@@ -1157,8 +1117,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
 #~ "Es kann immer nur eine Anwendung zur Paketverwaltung zur gleichen Zeit "
 #~ "ausgeführt werden. Bitte beenden Sie zuerst die andere Anwendung."
@@ -1167,8 +1127,7 @@ msgstr ""
 #~ msgstr "Initialisierung und Abrufen der Aktualisierungsliste..."
 
 #~ msgid "You need to be root to run this program"
-#~ msgstr ""
-#~ "Sie benötigen Administrationsrechte, um diese Anwendung auszuführen."
+#~ msgstr "Sie benötigen Administrationsrechte, um diese Anwendung auszuführen."
 
 #~ msgid "Edit software sources and settings"
 #~ msgstr "Bearbeiten der Software-Quellen und Einstellungen"
@@ -1206,15 +1165,14 @@ msgstr ""
 
 #~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
 #~ msgstr ""
-#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image <cdimage@ubuntu."
-#~ "com>"
+#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image <cdimage@ubuntu.com>"
 
 #~ msgid "Repositories changed"
 #~ msgstr "Geänderte Repositories"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1228,11 +1186,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Verfügbare Aktualisierungen</b></big>\n"
 #~ "\n"
-#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung "
-#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen "
-#~ "werden."
+#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann "
+#~ "durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden."
\ No newline at end of file
diff --git a/po/el.po b/po/el.po
index 82a02bb9..e4dc7fde 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,125 +1,140 @@
 # translation of el.po to Greek
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
-# Kostas Papadimas <pkst@gnome.org>, 2005.
 #
+# Kostas Papadimas <pkst@gnome.org>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-05 14:33+0200\n"
-"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 07:09+0000\n"
+"Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <team@gnome.gr>\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=2; plural=(n != 1);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Κάθε %s ημέρες"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Μετά από %s ημέρες"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Εισαγωγή κλειδιού"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
-msgstr ""
+msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
+"Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να "
+"είναι κατεστραμμένο."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
-msgstr ""
+msgstr "Αφάλμα απομάκρυνσης του κλειδιού"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
+"Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως "
+"σφάλμα."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Σφάλμα ελέγχου του CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Κατεστραμμένα πακέτα"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 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:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Αδυναμία υπολογισμού της αναβάθμισης"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
+"Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης. "
+"Παρακαλώ αναφέρετε το ως σφάλμα. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
+"Δεν ήταν δυνατή η αναβάθμιση του απαιτούμενου πακέτου. Παρακαλώ αναφέρετε το "
+"ως σφάλμα. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Αδυναμία εύρεσης μετα-πακέτου"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -127,45 +142,55 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Το σύστημα σας δεν περιέχει κάποιο από τα πακέτα ubuntu-desktop, kubuntu-"
+"desktop or edubuntu-desktop, και έτσι δεν είναι δυνατός ο εντοπισμός της "
+"έκδοσης του Ubuntu σας..\n"
+"Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να "
+"συνεχίσετε."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Ανάγνωση λανθάνουσας μνήμης"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Δεν βρέθηκε έγκυρη καταχώριση"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Κατά τον έλεγχο των πληροφοριών του repository δεν βρέθηκαν έγκυρες "
+"καταχωρίσεις αναβάθμισης.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Μη έγκυρες πληροφορίες repository"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο "
+"αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
 msgid "Error during update"
-msgstr ""
+msgstr "Σφάλμα κατά την ενημέρωση"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 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:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -174,216 +199,213 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελευθερώστε τουλάχιστον %s χώρου "
+"στο δίσκο. Αδειάστε τα απορρίμματα σας και αφαιρέστε διάφορα προσωρινά "
+"πακέτα από προηγούμενες εγκαταστάσεις με την εντολή 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. "
+"Παρακαλώ χρησιμοποιήστε την εντολή 'sudo apt-get install -f' ή το Synaptic "
+"για να διορθώσετε το σύστημα σας."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Αδυναμία λήψης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
+"διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Αφαίρεση παρωχημένων πακέτων;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Σφάλμα κατά την υποβολή"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Δημιουργήθηκαν ορισμένα προβλήματα κατά την εκκαθάριση. Παρακαλώ δείτε το "
+"παρακάτω μήνυμα για περισσότερες πληροφορίες. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr ""
+msgstr "Έλεγχος διαχειριστή πακέτων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Ενημέρωση πληροφοριών repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Ερώτηση για επιβεβαίωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr ""
+msgstr "Γίνεται αναβάθμιση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Η λήψη ολοκληρώθηκε"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Λήψη αρχείου %li από %li με %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s απομένουν"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Λήψη αρχείου %li από %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:136
-msgid "Applying changes"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Εγκατάσταση ενημερώσεων"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "Η αναβάθμιση θα τερματιστεί τώρα. Παρακαλώ αναφέρετε το ως σφάλμα."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Προέκυψε μοιραίο σφάλμα"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία ~/dist-upgrade.log "
+"και ~/dist-upgrade-apt.log στην αναφορά σας. Η αναβάθμιση τώρα θα "
+"τερματιστεί. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί."
+msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί."
+msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί."
+msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"Η αναβάθμιση μπορεί να διαρκέσει αρκετέςς ώρες και δεν είναι δυνατή η "
+"ακύρωση της αργότερα."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και "
+"έγγραφα."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Δεν βρέθηκαν αναβαθμίσεις"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Ενότητες:</b>"
+msgstr "<b>Απομάκρυνση %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Εγκατάσταση %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Αναβάθμιση %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Απαιτείται επανεκκίνηση"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -392,77 +414,71 @@ 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 ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu \"Dapper\" "
+"6.04</span>"
 
 #: ../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 ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Λήψη και εγκατάσταση των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Τροποποίηση των καναλιών λογισμικού"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Προετοιμασία της αναβάθμισης"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Γίνεται επανεκκίνηση του συστήματος"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Τερματικό"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "Αναβάθμιση Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "Ανα_φορά σφάλματος"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "Επανε_κκίνηση τώρα"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Συνέχεια αναβάθμισης"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -471,6 +487,11 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Θα πρέπει να κάνετε έλεγχο για ενημερώσεις χειροκίνητα</big></b>\n"
+"\n"
+"Το σύστημα σας δεν υποστηρίζει αυτόματο έλεγχο ενημερώσεων. Μπορείτε να "
+"ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού \"Σύστημα\" -> \"Διαχείριση "
+"συστήματος\" -> \"Ιδιότητες λογισμικού\"."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -479,113 +500,110 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Γίνεται έλεγχος για διαθέσιμες ενημερώσεις</b></big>\n"
+"\n"
+"Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και "
+"να παρέχουν νέες λειτουργίες."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Διατηρήστε το σύστημα σας ενημερωμένο</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Ακύρωση _λήψης αρχείων"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
-msgstr ""
+msgstr "Αλλαγές"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Έλεγχος για διαθέσιμες ενημερώσεις"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
-msgstr ""
+msgstr "Περιγραφή"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Σημειώσεις έκδοσης"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Εμφάνιση λεπτομερειών"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Εμφάνιση προόδου μοναδικών αρχείων"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
-msgstr ""
+msgstr "Αναβαθμίσεις λογισμικού"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και "
+"να παρέχουν νέες λειτουργίες."
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr ""
+msgstr "Ανα_βάθμιση"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "Ελε_γχος"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον"
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr ""
+msgstr "Ε_γκατάσταση ενημερώσεων"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Ενότητες:</b>"
+msgstr "<b>Κανάλια</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Ενότητες:</b>"
+msgstr "<b>Κλειδιά</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "Προσθήκη _Cdrom"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
-msgstr "Πι_στοποίηση"
+msgstr "Πιστοποίηση"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Δια_γραφή αρχείων ληφθέντων πακέτων"
 
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
-msgstr ""
+msgstr "Εισαγωγή του δημόσιου κλειδιού από έναν έμπιστο πάροχο λογισμικού"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr ""
+msgstr "Μέσα εγκατάστασης"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+msgstr "Αναβαθμίσεις διαδικτύου"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -593,35 +611,37 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους Ubuntu "
+"servers θα εγκαθίστανται αυτόματα. Θα πρέπει να εγκατασταθεί το πακέτο "
+"\"unattended-upgrades\"."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
-msgstr ""
+msgstr "Επαναφορά π_ροεπιλογών"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Επαναφορά των προεπιλεγμένων κλειδιών της διανομής σας"
 
 #: ../data/SoftwareProperties.glade.h:13
-#, fuzzy
 msgid "Software Preferences"
-msgstr "<b>Πηγές λογισμικού</b>"
+msgstr "Προτιμήσεις λογισμικού"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "Λή_ψη ενημερώσεων στο παρασκήνιο χωρίς να εγκατασταθούν"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -632,53 +652,55 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"b><big>Οι πληροφορίες καναλιού δεν είναι  ενημερωμένες</big></b>\n"
+"\n"
+"Θα πρέπει να ανανεώσετε τις πληροφορίες καναλιού για να εγκαταστήσετε "
+"λογισμικό και ενημερώσεις από τα τα νέα κανάλια που προσθέσατε ή "
+"τροποποιήσατε. \n"
+"\n"
+"Χρειάζεστε μια ενεργή σύνδεση στο διαδίκτυο για να συνεχίσετε."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Ενότητες:</b>"
+msgstr "<b>Κανάλι</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Σχόλιο:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Συστατικά</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Διανομή:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Ενότητες:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Ενότητες:</b>"
+msgstr "<b>Ενότητες</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
-msgstr "<b>Τύπος:</b> "
+msgstr "<b>Τύπος:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Εισάγετε την πλήρη γραμμή  APT του repository που θέλετε να "
+"<big><b>Εισάγετε την πλήρη γραμμή  APT του καναλιού που θέλετε να "
 "προσθέσετε</b></big>\n"
 "\n"
-"Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός "
-"repository, για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>. "
-"Μπορείτε να βρείτε λεπτομερήςπεριγραφή του τρόπου σύνταξης στην τεκμηρίωση."
+"Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός καναλιού, "
+"για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -686,41 +708,45 @@ msgstr "Γραμμή APT:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Προσθήκη Καναλιού"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"Binary\n"
+"Source"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Επεξεργασία καναλιού"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Σάρωση CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "Προσ_θήκη καναλιού"
+msgstr[1] "Προσ_θήκη καναλιών"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr ""
+msgstr "_Προσαρμοσμένο"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 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 ""
@@ -728,182 +754,197 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Αν έχει απενεργοποιηθεί ο αυτόματος έλεγχος για ενημερώσεις, θα πρέπει να "
+"ανανεώσετε τη λίστα καναλιών χειροκίνητα."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Υπενθύμιση για την ανανέωση της λίστας καναλιών"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Εμφάνιση λεπτομερειών μιας ενημέρωσης"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Αποθηκεύει το μέγεθος του διαλόγου του update-manager"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Αποθηκεύει τη κατάσταση του expander που περιέχει τη λίστα των αλλαγών και "
+"τις περιγραφής τους"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Το μέγεθος του παραθύρου"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr ""
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.06 Security Updates"
-msgstr ""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ενημερώσεις ασφαλείας Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.06 Updates"
-msgstr ""
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ενημερώσεις Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.06 Backports"
-msgstr ""
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 Backports"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Αναβαθμίσεις  Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 msgid "Officially supported"
-msgstr ""
+msgstr "Με επίσημη υποστήριξη"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Περιορισμένα πνευματικά δικαιώματα"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr ""
+msgstr "Community maintained (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Όχι-ελεύθερα (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
+msgstr "Αναβαθμίσεις ασφαλείας Debian 3.1 \"Sarge\""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
-msgstr ""
+msgstr "Oficially supported"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Λογισμικό μη συμβατό με DFSG"
+
+#~ msgid "Software Channel"
+#~ msgstr "Κανάλι λογισμικού"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Ενότητες:</b>"
+#~ msgid "Active"
+#~ msgstr "Ενεργό"
 
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Πηγές λογισμικού</b>"
+#~ msgid "Add Software Channels"
+#~ msgstr "Προσθήκη καναλιών λογισμικού"
 
-#, fuzzy
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Ενότητες:</b>"
+#~ msgid "Add the following software channel?"
+#~ msgid_plural "Add the following software channels?"
+#~ msgstr[0] "Να προστεθεί το παρακάτω κανάλι λογισμικού;"
+#~ msgstr[1] ""
 
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repository</b>"
+#~ msgid "You can install software from a channel. Use trusted channels, only."
+#~ msgstr ""
+#~ "Μπορείτε να εγκαταστήσετε λογισμικό από ένα κανάλι. Χρησιμοποιήστε μόνο "
+#~ "έμπιστα κανάλια."
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Προσωρινά αρχεία</b>"
+#~ msgid "Could not add any software channels"
+#~ msgstr "Αδυναμία προσθήκης καναλιών λογισμικού"
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Επιφάνεια Χρήσης</b>"
+#~ msgid "The file '%s' does not contain any valid software channels."
+#~ msgstr "Το αρχείο '%s' δεν περιέχει έγκυρα κανάλια λογισμικού."
 
-#, fuzzy
 #~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
+#~ "The upgrade is finished now. A reboot is required to now, do you want to do "
+#~ "this now?"
+#~ msgstr ""
+#~ "Η αναβάθμιση ολοκληρώθηκε. Απαιτείται επανεκκίνηση, θέλετε να γίνει τώρα;"
+
+#~ msgid ""
+#~ "<b><big>You need to manually reload the latest information about "
+#~ "updates</big></b>\n"
 #~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
+#~ "Your system does not check for updates automatically. You can configure this "
+#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 #~ msgstr ""
-#~ "<big><b>Κλειδιά πιστοποίησης</b></big>\n"
+#~ "<b><big>Πρέπει να ανανεώσετε χειροκίνητα τις τελευταίες πληροφορίες για τις "
+#~ "ενημερώσεις</big></b>\n"
 #~ "\n"
-#~ "Μπορείτε να προσθέτετε και να αφαιρείτε κλειδιά πιστοποίησης σε αυτό τον "
-#~ "διάλογο. Ένα κλειδί κάνειεφικτό το έλεγχο της ακεραιότητας του λογισμικού "
-#~ "που μεταφορτώνετε."
+#~ "Το σύστημα σας δεν έχει ρυθμιστεί να κάνει αυτόματο έλεγχο για ενημερώσεις. "
+#~ "Μπορείτε να ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού \"Σύστημα\" -> "
+#~ "\"Διαχείριση συστήματος\" -> \"Ιδιότητες λογισμικού\"."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Λήψη αλλαγών</span>\n"
+#~ "\n"
+#~ "Χρειάζεται να κάνετε λήψη των αλλαγών από τον κεντρικό εξυπηρετητή"
+
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Ανανέωση των τελευταίων πληροφοριών πακέτων για ενημερώσεις"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr ""
+#~ "Εμφάνιση διαθέσιμων αναβαθμίσεων και επιλογή αυτών που θα εγκατασταθούν"
+
+#~ msgid "Ubuntu 6.04 \"Dapper Drake\""
+#~ msgstr "Ubuntu 6.04 \"Dapper Drake\""
+
+#~ msgid "Ubuntu 5.10 \"Breezy Badger\""
+#~ msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
-#~ msgid "A_uthentication"
-#~ msgstr "Πι_στοποίηση"
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
-#, fuzzy
-#~ msgid "_Add Repository"
-#~ msgstr "<b>Repository</b>"
+#~ msgid "Ubuntu 5.04 Security Updates"
+#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
\ No newline at end of file
diff --git a/po/en_CA.po b/po/en_CA.po
index 9db0fa60..fbb28363 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,13 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-04-03 01:26-0500\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:18+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.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:104
 #, python-format
@@ -26,28 +27,29 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Error importing selected file"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "The selected file may not be a GPG key file or it might be corrupt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Error removing the key"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +57,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -81,7 +83,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -92,39 +93,37 @@ msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 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:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"The key you selected could not be removed. Please report this as a bug."
+"The key you selected could not be removed. Please report this as a bug. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -137,7 +136,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -185,205 +183,184 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Downloading changes..."
+msgid "Installing updates"
+msgstr "Installing updates..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, 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."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Details</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Install"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Upgrade finished"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -391,11 +368,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -415,8 +391,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -429,51 +405,38 @@ msgid "Details"
 msgstr "<b>Details</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Reload"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Upgrade finished"
@@ -507,57 +470,53 @@ msgid "Changes"
 msgstr "Changes"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Description"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Software Updates"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Upgrade finished"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Install"
@@ -631,7 +590,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -640,7 +599,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -662,14 +621,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Components</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sections:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -686,14 +644,14 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>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</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 "
@@ -725,7 +683,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -773,145 +733,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian Stable Security Updates"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officially supported"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Installing updates..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Reload the package information from the server."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Software Updates"
@@ -957,13 +887,16 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Components</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
@@ -983,16 +916,16 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Authentication keys</b></big>\n"
 #~ "\n"
-#~ "You can add and remove authentication keys in this dialogue. A key makes "
-#~ "it possible to check verify the integrity of the software you download."
+#~ "You can add and remove authentication keys in this dialogue. A key makes it "
+#~ "possible to check verify the integrity of the software you download."
 
 #~ msgid "A_uthentication"
 #~ msgstr "A_uthentication"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Add a new key file to the trusted keyring. Make sure that you got the key "
 #~ "over a secure channel and that you trust the owner. "
@@ -1017,11 +950,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Restore the default keys shiped with the distribution. This will not "
-#~ "change user-installed keys."
+#~ "Restore the default keys shiped with the distribution. This will not change "
+#~ "user-installed keys."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "Set _maximum size for the package cache"
@@ -1054,13 +987,11 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 
 #~ msgid "The following packages are not upgraded: "
 #~ msgstr "The following packages are not upgraded: "
@@ -1078,15 +1009,18 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Downloading changes..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "The updates are being applied."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Updating package list..."
@@ -1105,33 +1039,33 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "There is a new release of Ubuntu available!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 
 #~ msgid "Never show this message again"
 #~ msgstr "Never show this message again"
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Initializing and getting list of updates..."
@@ -1179,14 +1113,14 @@ msgstr ""
 #~ msgstr "Repositories changed"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1194,10 +1128,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
\ No newline at end of file
diff --git a/po/en_GB.po b/po/en_GB.po
index 96e8f28c..0d4de9e7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.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-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-04-19 22:51-0400\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:18+0000\n"
 "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,28 +26,29 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Error importing selected file"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "The selected file may not be a GPG key file or it might be corrupt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Error removing the key"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -81,7 +82,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -92,39 +92,37 @@ msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 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:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"The key you selected could not be removed. Please report this as a bug."
+"The key you selected could not be removed. Please report this as a bug. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -137,7 +135,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -185,206 +182,185 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Checking system configuration"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Downloading changes..."
+msgid "Installing updates"
+msgstr "Installing updates..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, 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."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Details</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Install"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Upgrade finished"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -392,11 +368,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -416,8 +391,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -430,51 +405,38 @@ msgid "Details"
 msgstr "<b>Details</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Reload"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -507,56 +469,52 @@ msgid "Changes"
 msgstr "Changes"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Description"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Software Updates"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Installing updates..."
@@ -632,7 +590,7 @@ msgid "_Check for updates automatically:"
 msgstr "Installing updates..."
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -641,7 +599,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -663,14 +621,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Components</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sections:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -687,14 +644,14 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>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</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 "
@@ -726,7 +683,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -774,145 +733,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian Stable Security Updates"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian Testing"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officially supported"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Installing updates..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Reload the package information from the server."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Software Updates"
@@ -947,6 +876,9 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Software Sources</b>"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Components</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -965,13 +897,13 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Authentication keys</b></big>\n"
 #~ "\n"
-#~ "You can add and remove authentication keys in this dialogue. A key makes "
-#~ "it possible to check verify the integrity of the software you download."
+#~ "You can add and remove authentication keys in this dialogue. A key makes it "
+#~ "possible to check verify the integrity of the software you download."
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Add a new key file to the trusted keyring. Make sure that you got the key "
 #~ "over a secure channel and that you trust the owner. "
@@ -1003,11 +935,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Restore the default keys shiped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shiped with the distribution. This will not change "
+#~ "user installed keys."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "Set _maximum size for the package cache"
@@ -1037,13 +969,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 
 #~ msgid "Cancel downloading the changelog"
 #~ msgstr "Cancel downloading the changelog"
@@ -1132,6 +1064,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Downloading changes..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "There are no updated packages"
 
@@ -1146,8 +1081,7 @@ msgstr ""
 #~ msgstr[1] "You have selected all %s updated packages, total size %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ msgid_plural "You have selected %s out of %s updated packages, total size %s"
 #~ msgstr[0] "You have selected %s out of %s updated package, size %s"
 #~ msgstr[1] "You have selected %s out of %s updated packages, total size %s"
 
@@ -1155,11 +1089,11 @@ msgstr ""
 #~ msgstr "The updates are being applied."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Updating package list..."
@@ -1175,22 +1109,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "There is a new release of Ubuntu available!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 
 #~ msgid "Never show this message again"
 #~ msgstr "Never show this message again"
@@ -1218,14 +1152,14 @@ msgstr ""
 #~ msgstr "Repositories changed"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1243,13 +1177,11 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "The following packages are not upgraded: "
+#~ msgstr "The following packages are not upgraded: "
\ No newline at end of file
diff --git a/po/es.po b/po/es.po
index f372c4b8..90c99c7f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,130 +9,135 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-04-04 15:00+0200\n"
-"Last-Translator: Jorge Bernal <koke@amedias.org>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 11:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Cada %s días"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Después de %s días"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Importar clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Hubo un error al importar el fichero seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté "
 "corrupto."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Hubo un error al quitar la clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
 "como un fallo."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Error explorando el CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Por favor, introduzca un nombre para el disco"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Por favor, inserte un disco en la unidad:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Paquetes rotos"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"Su sistema contiene paquetes rotos que no pueden ser arreglados con este "
+"software. Por favor, arréglelos primero usando Synaptic o apt-get antes de "
+"continuar."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "No se han podido actualizar los meta-paquetes requeridos"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Se ha tenido que desinstalar un paquete esencial"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "No se ha podido calcular la actualización"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
-"como un fallo."
+"Ha ocurrido un problema imposible de resolver cuando se calculaba la "
+"actualización. Por favor, informe de ésto como un error: "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Error autenticando algunos paquetes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"No ha sido posible autenticar algunos paquetes. Esto puede ser debido a un "
+"problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una "
+"lista de los paquetes no autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "No se ha podido instalar «%s»"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
-"como un fallo."
+"No ha sido posible instalar un paquete requerido. Por favor, informe de ésto "
+"como un fallo. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "No se ha podido suponer el meta-paquete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -140,46 +145,56 @@ 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 "
+"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:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Leyendo caché"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "No se ha encontrado una entrada válida"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Cuando se exploraba la información de su repositorio, se encontró una "
+"entrada no válida para la actualización.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Información de repositorio no válida"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"La actualización de la información del repositorio generó un archivo "
+"incorrecto. Por favor, informe de ésto como un error."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Hubo un error al quitar la clave"
+msgstr "Error durante la actualización"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Ocurrió un problema durante la actualización. Normalmente es debido a algún "
+"tipo de problema en la red, por lo que le recomendamos que compruebe su "
+"conexión de red y vuelva a intentarlo."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "No hay espacio suficiente en el disco"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -188,223 +203,214 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"La actualización se cancelará ahora. Por favor, libere al menos %s de "
+"espacio en disco. Vacíe su papelera y elimine los paquetes temporales de "
+"instalaciones anteriores usando «sudo apt-get clean» en una terminal."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "¿Desea comenzar la actualización?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "No se han podido instalar las actualizaciones"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"La actualización se cancelará ahora. Su sistema puede haber quedado en un "
+"estado no usable. Por favor, intente con «sudo apt-get install -f» en una "
+"terminal, o bien con Synaptic, para arreglar su sistema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "No se han podido descargar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"La actualización se cancelará ahora. Por favor, compruebe su conexión a "
+"internet (o su soporte de instalación) y vuelva a intentarlo. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "¿Desinstalar los paquetes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Error durante la confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Ha ocurrido algún problema durante el limpiado. por favor, vea el mensaje "
+"inferior para más información. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Ya hay otro gestor de paquetes en ejecución"
+msgstr "Comprobando gestor de paquetes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Actualizando la información del repositorio"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Solicitando confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Actualización finalizada"
+msgstr "Actualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Buscando paquetes obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "La actualización del sistema se ha completado."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Por favor, inserte «%s» en la unidad «%s»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "La descarga se ha completado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Descargando archivo %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s restantes"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Descargando archivo %li de %li a velocidad desconocida"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Descargando informe de cambios..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Instalando actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "No se ha podido instalar «%s»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
-"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
-"como un fallo."
+"La actualización se cancelará ahora. Por favor, avise de esto como un fallo."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Ha ocurrido un error fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Por favor, informe de esto como un fallo e incluya los ficheros ~/dist-"
+"upgrade.log y ~/dist-upgrade-apt.log en su informe. La actualización se "
+"cancelará ahora. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Se va a desinstalar %s paquete."
+msgstr[1] "Se van a desinstalar %s paquetes."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Se va a instalar %s paquete nuevo."
+msgstr[1] "Se van a instalar %s paquetes nuevos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Se va a actualizar %s paquete."
+msgstr[1] "Se van a actualizar %s paquetes."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Debe descargar un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"La actualización puede durar varias horas, y no puede cancelarse después en "
+"ningún momento."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Para prevenir la pérdida de datos, cierre todas las aplicaciones y "
+"documentos."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "No se ha podido encontrar ninguna actualización"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "¡Su sistema tiene paquetes rotos!"
+msgstr "Su sistema ya ha sido actualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Detalles:</b>"
+msgstr "<b>Desinstalar %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Instalar"
+msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Actualización finalizada"
+msgstr "Actualizar %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Se requiere reiniciar el equipo"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"La actualización ha finalizado, y se requiere reiniciar el equipo. ¿Desea "
+"hacerlo ahora?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -413,79 +419,71 @@ 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 la actualización en curso?</big></b>\n"
+"\n"
+"El sistema podría quedar en un estado no usable si cancela la actualización. "
+"Le recomendamos encarecidamente que continúe la actualización."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Reinicie el sistema para completar la actualización</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>¿Comenzar la actualización?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu «Dapper» "
+"6.04</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Limpiando"
 
 #: ../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 ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Descargando e instalando las actualizaciones"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modificando los canales de software"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Preparando la actualización"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Reiniciando el sistema"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Recargar"
+msgstr "Actualizando Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Informar de un error"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Reiniciar ahora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Actualización finalizada"
+msgstr "_Continuar actualización"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -494,6 +492,11 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 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»."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -502,118 +505,110 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Comprobando actualizaciones disponibles</b></big>\n"
+"\n"
+"Las actualizaciones de software pueden corregir errores, eliminar fallos de "
+"seguridad, y proporcionar nuevas funcionalidades."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Mantenga su sistema actualizado</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Cancelar _descarga"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Cambios"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Comprobar las actualizaciones disponibles"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Descripción"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Notas de publicación"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Mostrar detalles"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Mostrar el progreso de cada archivo individua"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Actualizaciones de software"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Las actualizaciones de software pueden corregir errores, eliminar fallos de "
+"seguridad, y proporcionar nuevas funcionalidades."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "Actualización finalizada"
+msgstr "A_ctualizar"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Actualizar a la última versión de Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Comprobar"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Ocultar esta información en el futuro"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "_Instalar"
+msgstr "_Instalar actualizaciones"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Detalles:</b>"
+msgstr "<b>Canales</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizaciones por Internet</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Detalles:</b>"
+msgstr "<b>Claves</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
-msgstr "Añadir _CD"
+msgstr "Añadir _CD-ROM"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
-msgstr "A_utenticación"
+msgstr "Autenticación"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Borrar archivos de software descargados:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Quitar la clave seleccionada del anillo de confianza."
+msgstr "Importar la clave pública desde un proveedor de confianza"
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Instalando actualizaciones..."
+msgstr "Soporte de la instalación"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Actualizaciones por Internet</b>"
+msgstr "Actualizaciones por Internet"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -621,15 +616,17 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Sólo se instalarán automáticamente las actualizaciones de seguridad que "
+"provengan de los servidores oficiales de Ubuntu. Para ello, necesita que se "
+"instale el paquete «unattended-upgrades»."
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Recuperar claves predeterminadas"
+msgstr "Restaurar valores predeterminados"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Restaurar las claves predeterminadas de su distribución"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -637,19 +634,19 @@ msgstr "Preferencias de software"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Comprobar actualizaciones automáticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Descargar actualizaciones en segundo plano, pero no instalarlas"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -660,29 +657,33 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>La información de los canales 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"
+"\n"
+"Necesita una conexión a internet para continuar."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Detalles:</b>"
+msgstr "<b>Canales</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comentario:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Componentes</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribución:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Secciones:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Secciones:</b>"
+msgstr "<b>Secciones</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -693,20 +694,18 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Introduzca la línea completa del repositorio APT que quiere añadir</"
-"b></big>\n"
+"<big><b>Introduzca la línea completa de APT del canal que quiere "
+"añadir</b></big>\n"
 "\n"
 "La línea de APT contiene el tipo, ubicación y contenido de un repositorio, "
-"por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Puede encontrar "
-"una descripción detallada de la sintaxis en la documentación."
+"por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -714,7 +713,7 @@ msgstr "Línea de APT:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Añadir un canal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -726,28 +725,29 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Cambiar un canal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Analizando el CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Añadir un canal"
+msgstr[1] "_Añadir canales"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Recargar"
+msgstr "_Recargar"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Muestra e instala las actualizaciones disponibles"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -759,167 +759,131 @@ msgid ""
 "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 "
+"la lista de canales manualmente. Esta opción le permite ocultar la "
+"notificación que se muestra en este caso."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Recordar la recarga de la lista de canales"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Mostrar detalles de una actualización"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Almacena el tamaño de la ventana del gestor de actualizaciones"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Almacena el estado del expansor que contiene la lista de cambios y sus "
+"descripciones"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "El tamaño de la ventana"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 «Dapper Drake»"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Actualizaciones de seguridad de Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Actualizaciones de Ubuntu 5.04"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Actualizaciones de Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Actualizaciones de Ubuntu 5.04"
+msgid "Ubuntu 6.04 Backports"
+msgstr "«Backports» de Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgstr "Ubuntu 5.10 «Breezy Badger»"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Actualizaciones de Ubuntu 5.04"
+msgstr "Actualizaciones de Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Actualizaciones de Ubuntu 5.04"
+msgstr "«Backports» de Ubuntu 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Copyright restringido"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Mantenido por la comunidad (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Software no libre (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 «Sarge»"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Actualizaciones de seguridad de Debian estable"
+msgstr "Actualizaciones de seguridad de Debian 3.1 «Sarge»"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian «Etch» (pruebas)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian «Sid» (inestable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Soportado oficialmente"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Software compatible con la DFSG con dependencias no libres"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Software no compatible con la DFSG"
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Instalando actualizaciones..."
-
-#, fuzzy
 #~ msgid "Reload the latest information about updates"
-#~ msgstr "Recargar la información del paquete desde el servidor."
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secciones:</b>"
+#~ msgstr "Recargar la última información sobre actualizaciones"
 
 #, fuzzy
 #~ msgid "Add Software Channels"
@@ -930,8 +894,7 @@ msgstr ""
 #~ "\n"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</span>\n"
 #~ "\n"
 #~ "Se necesita descargar los cambios del servidor central"
 
@@ -967,13 +930,16 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Actualizaciones disponibles</b></big>\n"
 #~ "\n"
-#~ "El gestor de actualizaciones encontró los siguientes paquetes "
-#~ "actualizables. Puede actualizarlos usando el botón Instalar."
+#~ "El gestor de actualizaciones encontró los siguientes paquetes actualizables. "
+#~ "Puede actualizarlos usando el botón Instalar."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Componentes</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repositorio</b>"
@@ -993,20 +959,19 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Claves de autenticación</b></big>\n"
 #~ "\n"
-#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una "
-#~ "clave hace posible verificar la integridad del software que descarga."
+#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una clave "
+#~ "hace posible verificar la integridad del software que descarga."
 
 #~ msgid "A_uthentication"
 #~ msgstr "A_utenticación"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Añadir un nuevo archivo de clave al anillo de confianza. Asegúrese de que "
-#~ "obtuvo la clave a través de un canal seguro y que confía en el "
-#~ "propietario. "
+#~ "obtuvo la clave a través de un canal seguro y que confía en el propietario. "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Limpiar _temporalmente los archivos de paquetes"
@@ -1028,8 +993,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Recupera las claves entregadas originalmente con la distribución. Esto no "
 #~ "cambia las claves instaladas por el usuario."
@@ -1057,8 +1022,8 @@ msgstr ""
 #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
 #~ msgstr ""
 #~ "Ésto significa que no se satisfacen algunas dependencias de los paquetes "
-#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-"
-#~ "get dist-upgrade\" para arreglar la situación."
+#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-get "
+#~ "dist-upgrade\" para arreglar la situación."
 
 #~ msgid "It is not possible to upgrade all packages."
 #~ msgstr "No es posible actualizar todos los paquetes."
@@ -1066,13 +1031,12 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "Ésto significa que además de la actualización de los paquetes será "
-#~ "necesaria alguna acción adicional (como instalar o quitar paquetes). "
-#~ "Utilice la \"Actualización inteligente\" de synaptic o \"apt-get dist-"
-#~ "upgrade\" para arreglar la situación."
+#~ "Ésto significa que además de la actualización de los paquetes será necesaria "
+#~ "alguna acción adicional (como instalar o quitar paquetes). Utilice la "
+#~ "\"Actualización inteligente\" de synaptic o \"apt-get dist-upgrade\" para "
+#~ "arreglar la situación."
 
 #~ msgid "The following packages are not upgraded: "
 #~ msgstr "Los siguientes paquetes no están actualizados: "
@@ -1086,21 +1050,24 @@ msgstr ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
-#~ "Hubo un fallo al descargar el informe de cambios. Compruebe si tiene "
-#~ "alguna conexión activa."
+#~ "Hubo un fallo al descargar el informe de cambios. Compruebe si tiene alguna "
+#~ "conexión activa."
 
 #~ msgid "Version %s: \n"
 #~ msgstr "Versión %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Descargando informe de cambios..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Se están aplicando las actualizaciones."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo "
-#~ "tiempo. Cierre la otra aplicación primero."
+#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo tiempo. "
+#~ "Cierre la otra aplicación primero."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Actualizando lista de paquetes..."
@@ -1119,34 +1086,35 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está "
-#~ "usando no obtendrá más actualizaciones de seguridad ni otras "
-#~ "actualizaciones críticas. Visite http://www.ubuntulinux.org para "
-#~ "información acerca de cómo actualizar."
+#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está usando "
+#~ "no obtendrá más actualizaciones de seguridad ni otras actualizaciones "
+#~ "críticas. Visite http://www.ubuntulinux.org para información acerca de cómo "
+#~ "actualizar."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Hay una nueva versión de Ubuntu disponible"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "Está disponible una nueva versión con el nombre '%s'. Visite http://www."
-#~ "ubuntulinux.org/ para recibir instrucciones acerca de cómo actualizar."
+#~ "Está disponible una nueva versión con el nombre '%s'. Visite "
+#~ "http://www.ubuntulinux.org/ para recibir instrucciones acerca de cómo "
+#~ "actualizar."
 
 #~ msgid "Never show this message again"
 #~ msgstr "No mostrar más este mensaje"
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo "
-#~ "tiempo. Cierre la otra aplicación primero."
+#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo tiempo. "
+#~ "Cierre la otra aplicación primero."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Inicializando y obteniendo lista de actualizaciones..."
@@ -1197,8 +1165,8 @@ msgstr ""
 #~ msgstr "Hay cambios en los repositorios"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1212,10 +1180,10 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Actualizaciones disponibles</b></big>\n"
 #~ "\n"
-#~ "El gestor de actualizaciones encontró los siguientes paquetes "
-#~ "actualizables. Puede actualizarlos usando el botón Instalar."
+#~ "El gestor de actualizaciones encontró los siguientes paquetes actualizables. "
+#~ "Puede actualizarlos usando el botón Instalar."
\ No newline at end of file
diff --git a/po/fi.po b/po/fi.po
index 87d9d878..7acc900a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,16 +1,16 @@
 # update-manager's Finnish translation.
-# Copyright (C) 2005 Timo Jyrinki
+# Copyright (C) 2005-2006 Timo Jyrinki
 # This file is distributed under the same license as the update-manager package.
-# Timo Jyrinki <timo.jyrinki@iki.fi>, 2005.
+# Timo Jyrinki <timo.jyrinki@iki.fi>, 2005-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-30 08:30+0200\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
-"Language-Team: Finnish <LL@li.org>\n"
+"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-27 10:27+0000\n"
+"Last-Translator: Marko Kervinen <marko_kervinen@hotmail.com>\n"
+"Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,112 +19,120 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "%s päivän välein"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "%s päivän jälkeen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Tuo avain"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Virhe tuotaessa valittua avainta"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto"
+msgstr ""
+"Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on "
+"vahingoittunut."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Virhe poistettaessa avainta"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Virhe luettaessa CD-levyä</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Syötä nimi levylle"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Aseta levy asemaan:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Rikkinäisiä paketteja"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 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 "
+"jatkamista."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Ei voida päivittää tarvittavia metapaketteja"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Välttämätön paketti jouduttaisiin poistamaan"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
+"Tehtäessä päivitykseen liittyviä tarkistuksia tapahtui virhe jota ei voitu "
+"korjata. Ilmoita tästä virheraportilla. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Tapahtui virhe varmennettaessa joitain paketteja"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Joitain paketteja ei voitu varmentaa. Tämä voi olla ohimenevä verkko-"
+"ongelma. Voit yrittää myöhemmin uudelleen. Alla on luettelo "
+"varmentamattomista paketeista."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Ei voitu asentaa pakettia '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
+"Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheilmoitus. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Ei voitu arvata metapakettia"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -132,46 +140,55 @@ 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 "
+"ennen jatkamista."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Luetaan kätköä"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Ei löytynyt kelpoa ohjelmavarastomerkintää"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Luettaessa varastotietoja ei löydetty kelvollisia ohjelmavarastoja "
+"päivittämistä varten.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Virhe ohjelmavarastotiedoissa"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Virhe poistettaessa avainta"
+msgstr "Virhe päivitettäessä"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. "
+"Tarkista verkkoyhteytesi toiminta ja yritä uudelleen."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Levytilaa ei ole riittävästi"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -180,218 +197,205 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Päivitys keskeytyy. Vapauta levytilaa vähintään %s. Tyhjennä roskakorisi ja "
+"poista aiempien asennusten väliaikaiset pakettitiedostot käyttämällä "
+"komentoa 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Haluatko aloittaaa päivityksen?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Ei voitu asentaa päivityksiä"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. "
+"Kokeile komentoa 'sudo apt-get install -f' tai Synaptic-ohjelmaa "
+"korjataksesi järjestelmän."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Ei voitu ladata päivityksiä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. "
+"CD) toiminta ja yritä uudelleen. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Poista vanhentuneet paketit?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Virhe suoritettaesa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 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. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Toinen pakettienhallinta on käynnissä"
+msgstr "Tarkistetaan pakettienhallintaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Päivitetään ohjelmavarastotietoja"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Pyydetään vahvistusta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Päivitykset suoritettu"
+msgstr "Päivitetään"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Etsitään vanhetuneita ohjelmia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Järjestelmän päivitys on valmis."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Laita '%s' asemaan '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Lataus on valmis"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Ladataan tiedostoa %li/%li nopeudella %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s jäljellä"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Ladataan tiedostoa %li/%li tuntemattomalla nopeudella"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Ladataan muutoksia..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Asennetaan päivityksiä"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Ei voituu asentaa: '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Vakava virhe tapahtui"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot ~/dist-"
+"upgrade.log ja ~/dist-upgrade-apt.log. Päivitys keskeytyy nyt. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s paketti poistetaan"
+msgstr[1] "%s pakettia poistetaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s uusi paketti asennetaan"
+msgstr[1] "%s uutta pakettia asennetaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s paketti päivitetään"
+msgstr[1] "%s pakettia päivitetään"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Ladattavaa yhteensä %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Päivityksiä ei löytynyt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Järjestelmässä on rikkinäisiä paketteja!"
+msgstr "Järjestelmäsi on jo päivitetty."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Yksityiskohdat</b>"
+msgstr "<b>Poista %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Asenna"
+msgstr "Asenna %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Päivitykset suoritettu"
+msgstr "Päivitä %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Uudellenkäynnistys vaaditaan"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Päivitys on valmis ja uudelleenkäynnistys vaaditaan. Haluatko tehdä sen nyt?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
@@ -404,79 +408,72 @@ 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>Peruuta käynnissä oleva päivitys?</big></b>\n"
+"\n"
+"Järjestelmä voi olla käyttökelvottomassa tilassa, jos peruutat päivityksen. "
+"On hyvin suositeltavaa jatkaa päivitystä."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Käynnistä järjestelmä uudelleen saattaaksesi päivityksen "
+"loppuun</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Aloita päivitys?</big/</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Päivitetään seuraavaksi: Ubuntu "
+"\"Dapper\" 6.04</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Siistitään"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Yksityiskohdat</b>"
+msgstr "Yksityiskohdat"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Ladataan ja asennetaan päivityksiä"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Muutetaan ohjelmakanavia"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Valmistellaan päivitystä"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Käynnistetään järjestelmä uudelleen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Pääte"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "Päivitetään Ubuntua"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Päivitä"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Tee virheraportti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Uudelleenkäynnistä nyt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Päivitykset suoritettu"
+msgstr "_Jatka päivitystä"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -485,6 +482,10 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 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\"."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -493,117 +494,110 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Tarkistetaan saatavilla olevia päivityksiä</b></big>\n"
+"\n"
+"Ohjelmapäivitykset voivat korjata virheitä ja turva-aukkoja tai tarjota "
+"uusia ominaisuuksia."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Peruuta _lataus"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Muutokset"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Tarkista saatavilla olevat päivitykset"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Julkaisutiedot"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Näytä yksityiskohdat"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Näytä edistyminen yksittäisten tiedostojen osalta"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Ohjelmapäivitykset"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Ohjelmapäivitykset voivat korjata virheitä ja turva-aukkoja tai tarjota "
+"uusia ominaisuuksia."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "Päivitykset suoritettu"
+msgstr "_Päivitä"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Päivitä Ubuntun viimeisimpään versioon"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Check"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "P_iilota tämä tieto jatkossa"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "_Asenna"
+msgstr "_Asenna päivitykset"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Yksityiskohdat</b>"
+msgstr "<b>Kanavat</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-päivitykset</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Yksityiskohdat</b>"
+msgstr "<b>Avaimet</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
 msgstr "Lisää _CD"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
-msgstr "Varmenn_us"
+msgstr "Varmennus"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Poista ladatut ohjelmatiedostot:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Poista valittu avain luotetuista avaimista."
+msgstr "Asenna julkinen avain luotetulta ohjelmistotoimittajalta"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr ""
+msgstr "Asennuslähteet"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Internet-päivitykset</b>"
+msgstr "Internet-päivitykset"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -611,15 +605,17 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Vain turvallisuuspäivitykset virallisilta Ubuntu-palvelimilta asennetaan "
+"automaattisesti. Ohjelmapaketti \"unattented-upgrades\" tulee sen takia "
+"asentaa."
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Palauta oletusavaimet"
+msgstr "Palauta _oletukset"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Palauta jakelusi oletusavaimet"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -627,20 +623,19 @@ msgstr "Asetukset"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Tarkista päivitykset automaattisesti:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Asenna turvallisuuspäivitykset kysymättä"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
-#, fuzzy
 msgid "     "
-msgstr "    "
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -651,29 +646,32 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Kanavatiedot ovat vanhentuneita</big></b>\n"
+"\n"
+"Kanavatiedot täytyy ladata uudelleen ohjelmien tai päivitysten asentamiseksi "
+"uusista tai muuttuneista kanavista. \n"
+"\n"
+"Tarvitset toiminnassa olevan Internet-yhteyden jatkaaksesi."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Yksityiskohdat</b>"
+msgstr "<b>Kanava</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentti:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Komponentit</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Jakelu:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Osastot:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Osastot:</b>"
+msgstr "<b>Osastot</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -684,19 +682,17 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Kirjoita haluamasi varaston koko APT-rivi</b></big>\n"
+"<big><b>Kirjoita haluamasi kanavan koko APT-rivi</b></big>\n"
 "\n"
-"APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi <i>"
-"\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät "
-"dokumentaatiosta."
+"APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -704,7 +700,7 @@ msgstr "APT-rivi:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Lisää kanava"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -716,28 +712,29 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Muokkaa kanavaa"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Luetaan CD-levyä"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Lisää kanava"
+msgstr[1] "_Lisää kanavia"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Muu"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Päivitä"
+msgstr "_Lataa uudelleen"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Näytä ja asenna saatavilla olevat päivitykset"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -749,219 +746,208 @@ msgid ""
 "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 "
+"piilottamisen."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Muistuta kanavaluettelon uudelleenlataamisesta"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Näytä päivityksen yksityiskohdat"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Tallentaa päivitystenhallintaikkunan koon"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Tallentaa muutoslistan ja kuvauksen näyttämän ikkunalaajennoksen tilan."
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Ikkunan koko"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 turvallisuuspäivitykset"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 päivitykset"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 takaisinsovitukset"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 5.10 päivitykset"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 5.10 takaisinsovitukset"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Virallisesti tuettu"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Rajoitettu tekijänoikeus"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr "Yhteisön ylläpitämä (Universe)"
+msgstr "Yhteisön ylläpitämät (universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr "Ei-vapaat ohjelmat (Multiverse)"
+msgstr "Ei-vapaat ohjelmat (multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable turvallisuuspäivitykset"
+msgstr "Debian 3.1 \"Sarge\" turvallisuuspäivitykset"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testattava)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (epävakaa)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Virallisesti tuettu"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
+"DFSG-yhteensopivat ohjelmat joilla riippuvuuksia epävapaisiin ohjelmiin"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "DFSG-epäyhteensopivat ohjelmat"
 
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Lataa pakettitiedot uudelleen palvelimelta."
+#~ msgid "_Download updates in the background, but do not install them"
+#~ msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Osastot:</b>"
+#~ msgid "Software Channel"
+#~ msgstr "Ohjelmistokanava"
 
-#, fuzzy
-#~ msgid "Add Software Channels"
-#~ msgstr "Ohjelmapäivitykset"
+#~ msgid "Active"
+#~ msgstr "Aktiivinen"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "<big><b>Error scanning the CD</b></big>\n"
 #~ "\n"
-#~ "Need to get the changes from the central server"
+#~ "%s"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ladataan muutoksia</span>\n"
+#~ "<big><b>Virhe luettaessa CD-levyä</b></big>\n"
 #~ "\n"
-#~ "Muutokset täytyy ladata keskuspalvelimelta"
+#~ "%s"
 
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat"
+#~ msgid "Add Software Channels"
+#~ msgstr "Lisää ohjelmistokanavia"
 
-#, fuzzy
-#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-#~ msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+#~ msgid "Add the following software channel?"
+#~ msgid_plural "Add the following software channels?"
+#~ msgstr[0] "Lisää seuraava ohjelmistokanava?"
+#~ msgstr[1] "Lisää seuraavat ohjelmistokanavat?"
 
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Virhe poistettaessa avainta"
+#~ msgid "You can install software from a channel. Use trusted channels, only."
+#~ msgstr "Voit asentaa ohjelmia eri kanavilta. Käytä vain luotettuja kanavia."
 
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Ohjelmalähteet</b>"
+#~ msgid "Could not add any software channels"
+#~ msgstr "Ei voitu lisätä yhtään ohjelmistokanavaa"
 
-#, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Tarkista ohjelma_päivitykset automaattisesti."
+#~ msgid "The file '%s' does not contain any valid software channels."
+#~ msgstr "Tiedosto '%s' ei sisällä sopivia ohjelmistokanavia."
 
-#, fuzzy
-#~ msgid "Cancel downloading of the changelog"
-#~ msgstr "Keskeytä muutosluettelon lataus"
+#~ msgid "Remove obsolete packages?"
+#~ msgstr "Poista vanhentuneet paketit?"
 
-#~ msgid "Choose a key-file"
-#~ msgstr "Valitse avaintiedosto"
+#~ msgid "_Skip This Step"
+#~ msgstr "_Ohita tämä kohta"
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Asennettavat paketit:</b>"
+#~ msgid "_Remove"
+#~ msgstr "_Poista"
 
 #~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
+#~ "<b><big>You need to manually reload the latest information about "
+#~ "updates</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>Saatavilla olevat päivitykset</b></big>\n"
+#~ "<b><big>Sinun pitää ladata päivitystiedot uudelleen käsin</big></b>\n"
 #~ "\n"
-#~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
-#~ "Asenna-painiketta."
+#~ "Järjestelmäsi ei tarkista päivityksiä automaattisesti. Voit asettaa tätä "
+#~ "kohdassa \"Järjestelmä\" -> \"Hallinta\" -> \"Ohjelma-asetukset\"."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ladataan muutoksia</span>\n"
+#~ "\n"
+#~ "Muutokset täytyy ladata keskuspalvelimelta"
 
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Varasto</b>"
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Lataa päivitystiedot uudelleen"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat"
+
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Komponentit</b>"
+
+#~ msgid "<b>Software Sources</b>"
+#~ msgstr "<b>Ohjelmalähteet</b>"
 
 #~ msgid "<b>Temporary files</b>"
 #~ msgstr "<b>Väliaikaistiedostot</b>"
@@ -969,7 +955,6 @@ msgstr ""
 #~ msgid "<b>User Interface</b>"
 #~ msgstr "<b>Käyttöliittymä</b>"
 
-#, fuzzy
 #~ msgid ""
 #~ "<big><b>Authentication keys</b></big>\n"
 #~ "\n"
@@ -978,20 +963,35 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Varmennusavaimet</b></big>\n"
 #~ "\n"
-#~ "Voit lisätä ja poistaa varmennusavaimia tässä valintaikkunassa. Avaimella "
-#~ "voidaan tarkistaa lataamiesi ohjelmien eheys."
+#~ "Voit lisätä ja poistaa varmennusavaimia tässä valintaikkunassa. Avain "
+#~ "mahdollistaa lataamiesi ohjelmistojen eheyden tarkistamisen."
+
+#~ msgid ""
+#~ "<big><b>Enter the complete APT line of the repository that you want to "
+#~ "add</b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and content of a repository, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+#~ "detailed description of the syntax in the documentation."
+#~ msgstr ""
+#~ "<big><b>Kirjoita haluamasi varaston koko APT-rivi</b></big>\n"
+#~ "\n"
+#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi "
+#~ "<i>\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät "
+#~ "dokumentaatiosta."
 
 #~ msgid "A_uthentication"
 #~ msgstr "Varmenn_us"
 
-#, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että "
-#~ "vastaanotit avaimen luotettua kanavaa pitkin ja että luotat avaimen "
-#~ "omistajaan. "
+#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että vastaanotit "
+#~ "avaimen luotettavaa kanavaa pitkin, ja että luotat sen omistajaan. "
+
+#~ msgid "Automatically check for software _updates."
+#~ msgstr "Tarkista ohjelma_päivitykset automaattisesti."
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Tyhjennä _väliaikaistiedostot automaattisesti"
@@ -1011,13 +1011,12 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Maksimikoko megatavuissa:"
 
-#, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia "
-#~ "käyttäjän asentamiin avaimiin."
+#~ "Palauta jakelun mukana toimitetut oletusavaimet. Tämä ei muuta tai poista "
+#~ "itse asennettuja avaimia."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "Aseta _maksimikoko pakettivälimuistille"
@@ -1037,12 +1036,92 @@ msgstr ""
 #~ msgid "_Download upgradable packages"
 #~ msgstr "_Lataa päivitettävät paketit"
 
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Asennettavat paketit:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
+#~ msgstr ""
+#~ "<big><b>Saatavilla olevat päivitykset</b></big>\n"
+#~ "\n"
+#~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
+#~ "Asenna-painiketta."
+
+#~ msgid "Cancel downloading the changelog"
+#~ msgstr "Keskeytä muutosluettelon lataus"
+
+#~ msgid ""
+#~ "Reload the package information from the server. \n"
+#~ "\n"
+#~ "If you have a permanent internet connection this is done automatically. If "
+#~ "you are behind an internet connection that needs to be started by hand (e.g. "
+#~ "a modem) you should use this button so that update-manager knows about new "
+#~ "updates."
+#~ msgstr ""
+#~ "Lataa pakettitiedot palvelimelta uudelleen. \n"
+#~ "\n"
+#~ "Jos sinulla on kiinteä Internet-yhteys, tämä tehdään automaattisesti. Jos "
+#~ "olet käsin muodostettavan Internet-yhteyden (esim. modeemi) takana, sinun "
+#~ "täytyy käyttää tätä valintaa jotta päivitystenhallinta saisi tiedon uusista "
+#~ "päivityksistä."
+
+#~ msgid "Binary"
+#~ msgstr "Binääri"
+
+#~ msgid "Source"
+#~ msgstr "Lähdekoodi"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Ubuntu 4.10 Security Updates"
+#~ msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
+
+#~ msgid "Contributed software"
+#~ msgstr "Muiden tarjoamat ohjelmat"
+
+#~ msgid "Non-free software"
+#~ msgstr "Ei-vapaat ohjelmat"
+
+#~ msgid "US export restricted software"
+#~ msgstr "USA:sta vientirajoitetut ohjelmat"
+
+#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#~ msgstr ""
+#~ "Ubuntu-arkiston automaattinen allekirjoitusavain <ftpmaster@ubuntu.com>"
+
+#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ msgstr ""
+#~ "Ubuntun CD-vedosten automaattinen allekirjoitusavain <cdimage@ubuntu.com>"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Valitse avaintiedosto"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Varastot muuttuneet"
+
+#~ msgid ""
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
+#~ "\n"
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Varastotiedoissa on muutoksia. Varmuuskopio tiedostosta sources.list on "
+#~ "tallennettu nimellä %s.save. \n"
+#~ "\n"
+#~ "Ohjelmapakettien luettelo täytyy ladata uudelleen palvelimelta, jotta "
+#~ "muutoksesi tulevat voimaan. Haluatko tehdä tämän nyt?"
+
 #~ msgid ""
 #~ "This means that some dependencies of the installed packages are not "
 #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
 #~ msgstr ""
-#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. "
-#~ "Käytä \"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman."
+#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. Käytä "
+#~ "\"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman."
 
 #~ msgid "It is not possible to upgrade all packages."
 #~ msgstr "Kaikkia paketteja ei voida päivittää."
@@ -1050,13 +1129,15 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita "
-#~ "toimenpiteitä (kuten pakettien asentamista tai poistamista). Käytä "
-#~ "Synaptic-ohjelman \"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade"
-#~ "\"-komentoa korjataksesi ongelman."
+#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita toimenpiteitä "
+#~ "(kuten pakettien asentamista tai poistamista). Käytä Synaptic-ohjelman "
+#~ "\"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade\"-komentoa "
+#~ "korjataksesi ongelman."
+
+#~ msgid "The following packages are not upgraded: "
+#~ msgstr "Seuraavia paketteja ei päivitetä: "
 
 #~ msgid "Changes not found, the server may not be updated yet."
 #~ msgstr "Muutoksia ei löytynyt, palvelinta ei ole ehkä vielä päivitetty."
@@ -1064,22 +1145,27 @@ msgstr ""
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
-#~ msgstr ""
-#~ "Muutosten lataus epäonnistui. Tarkista, että Internet-yhteys toimii."
+#~ msgstr "Muutosten lataus epäonnistui. Tarkista, että Internet-yhteys toimii."
 
 #~ msgid "Version %s: \n"
 #~ msgstr "Versio: %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Ladataan muutoksia..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Päivityksiä asennetaan."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Voit hallita paketteja vain yhdellä ohjelmalla kerrallaan. Sulje toinen "
 #~ "ohjelma ensin."
 
+#~ msgid "Updating package list..."
+#~ msgstr "Päivitetään pakettiluetteloa..."
+
 #~ msgid "Your system is up-to-date!"
 #~ msgstr "Järjestelmäsi on ajan tasalla!"
 
@@ -1094,20 +1180,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei "
-#~ "enää ole tulossa turvallisuuspäivityksiä tai muita kriittisiä "
-#~ "päivityksiä. Tietoja päivittämisestä löydät sivulta http://www."
-#~ "ubuntulinux.org."
+#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei enää "
+#~ "ole tulossa turvallisuuspäivityksiä tai muita kriittisiä päivityksiä. "
+#~ "Tietoja päivittämisestä löydät sivulta http://www.ubuntulinux.org."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Ubuntusta on uusi julkaisu saatavilla!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
 #~ "Uusi julkaisu nimeltään '%s' on saatavilla. Päivitysohjeet löydät "
 #~ "osoitteesta http://www.ubuntulinux.org/."
@@ -1115,13 +1200,15 @@ msgstr ""
 #~ msgid "Never show this message again"
 #~ msgstr "Älä näytä tätä viestiä uudestaan"
 
-#, fuzzy
+#~ msgid "Unable to get exclusive lock"
+#~ msgstr "Ei saatu haluttua lukitusta"
+
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "Voit hallita paketteja vain yhdellä ohjelmalla kerrallaan. Sulje toinen "
-#~ "ohjelma ensin."
+#~ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-get "
+#~ "tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Alustetaan ja ladataan luetteloa päivityksistä..."
@@ -1135,59 +1222,39 @@ msgstr ""
 #~ msgid "Software Properties"
 #~ msgstr "Asetukset"
 
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntun päivitysten hallinta"
-
-#~ msgid "Binary"
-#~ msgstr "Binääri"
-
-#~ msgid "Source"
-#~ msgstr "Lähdekoodi"
-
-#~ msgid "CD"
-#~ msgstr "CD"
-
-#~ msgid "Ubuntu 4.10 Security Updates"
-#~ msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
-
-#~ msgid "Contributed software"
-#~ msgstr "Muiden tarjoamat ohjelmat"
-
-#~ msgid "Non-free software"
-#~ msgstr "Ei-vapaat ohjelmat"
-
-#~ msgid "US export restricted software"
-#~ msgstr "USA:sta vientirajoitetut ohjelmat"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#~ msgid ""
+#~ "<big><b>Authentication keys</b></big>\n"
+#~ "\n"
+#~ "You can add and remove authentication keys in this dialog. A key makes it "
+#~ "possible to check verify the integrity of the software you download."
 #~ msgstr ""
-#~ "Ubuntu-arkiston automaattinen allekirjoitusavain <ftpmaster@ubuntu.com>"
+#~ "<big><b>Varmennusavaimet</b></big>\n"
+#~ "\n"
+#~ "Voit lisätä ja poistaa varmennusavaimia tässä valintaikkunassa. Avaimella "
+#~ "voidaan tarkistaa lataamiesi ohjelmien eheys."
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ msgid ""
+#~ "Add a new key file to the trusted keyring. Make sure that you got the key "
+#~ "over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "Ubuntun CD-vedosten automaattinen allekirjoitusavain <cdimage@ubuntu.com>"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Varastot muuttuneet"
+#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että vastaanotit "
+#~ "avaimen luotettua kanavaa pitkin ja että luotat avaimen omistajaan. "
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
-#~ "\n"
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
+#~ "Restore the default keys shiped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Varastotiedoissa on muutoksia. Varmuuskopio tiedostosta sources.list on "
-#~ "tallennettu nimellä %s.save. \n"
-#~ "\n"
-#~ "Ohjelmapakettien luettelo täytyy ladata uudelleen palvelimelta, jotta "
-#~ "muutoksesi tulevat voimaan. Haluatko tehdä tämän nyt?"
+#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia käyttäjän "
+#~ "asentamiin avaimiin."
+
+#~ msgid "Ubuntu Update Manager"
+#~ msgstr "Ubuntun päivitysten hallinta"
 
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Saatavilla olevat päivitykset</b></big>\n"
 #~ "\n"
@@ -1198,4 +1265,4 @@ msgstr ""
 #~ msgstr "0"
 
 #~ msgid "Non-free"
-#~ msgstr "Ei-vapaa"
+#~ msgstr "Ei-vapaa"
\ No newline at end of file
diff --git a/po/fr.po b/po/fr.po
index c0374788..fd60edbc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,133 +3,139 @@
 # This file is distributed under the same license as the update-manager package.
 # Jean Privat <privat@lirmm.fr>, 2005.
 # Vincent Carriere <carriere_vincent@yahoo.fr>, 2005
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-04-04 19:43+0200\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-29 05:45+0000\n"
+"Last-Translator: Alexandre Patenaude <alexandre.patenaude@gmail.com>\n"
 "Language-Team: French <gnomefr@traduc.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:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Tous les %s jours"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Après %s jours"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Importer la clé"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Erreur lors du chargement du fichier sélectionné"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
-"Le fichier sélectionné n'est peut-être pas un clé GPG ou alors il est "
+"Le fichier sélectionné n'est peut-être pas une clé GPG ou alors il est "
 "corrompu."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Erreur lors de la suppression de la clé"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
-"ceci comme étant un bug."
+"La clé que vous avez sélectionné ne peut être supprimée. Veuillez envoyer "
+"ceci comme étant un bogue."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Erreur lors de l'analyse du CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Veuillez saisir un nom pour le disque"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Veuillez insérer un disque dans le lecteur:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Paquets défectueux"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 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 ""
+"Votre système contient des paquets défectueux qui n'ont pu être réparés avec "
+"ce logiciel. Veuillez d'abord les réparer à l'aide de synaptic ou d'apt-get "
+"avant de continuer."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Les meta-paquets désirés n'ont pu être mis à jour"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Un paquet essentiel devrait être enlevé"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Impossible de calculer la mise à jour"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
-"ceci comme étant un bug."
+"Un problème insoluble est apparu lors du calcul de la mise à jour. Merci de "
+"signaler ce bogue. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Erreur lors de l'authentification de certains paquets"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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 ""
+"Il a été impossible d'authentifier certains paquets. Cela peut provenir d'un "
+"problème de transmission 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
-"ceci comme étant un bug."
+"Il a été impossible d'installer un paquet pourtant requis. Merci de signaler "
+"ce bogue. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Impossible de déterminer le meta-paquet"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -137,46 +143,56 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Votre système ne contient pas un paquet ubuntu-desktop, kubuntu-desktop ou "
+"edubuntu-desktop, et il n'a par conséquent pas été possible de détecter "
+"quelle version d'Ubuntu 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:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Lecture du cache"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Aucune entrée valide trouvée"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Durant la vérification des informations du dépôt, aucune entrée valide pour "
+"la mise à jour n'a été trouvée.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Information sur le dépôt invalide"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"La mise à jour des informations de le dépôt a créé un fichier invalide. "
+"Veuillez rapporter ceci en tant que bogue."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Erreur lors de la suppression de la clé"
+msgstr "Erreur lors de la mise à jour"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Un problème est survenu lors de la mise à jour. Ceci est généralement dû à "
+"un problème quelconque du réseau. Veuillez vérifier votre connexion au "
+"réseau et réessayer."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Il n'y a pas assez d'espace libre sur le disque"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -185,219 +201,208 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"La mise à jour vient d'échouer. Veuillez libérer au moins %s d'espace "
+"disque. Videz votre corbeille et supprimez les paquets temporaires des "
+"installations précédentes en utilisant 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Voulez-vous commencer la mise à jour ?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Les mises à jour n'ont pu être installées"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"La mise à jour a été abandonnée maintenant. Votre système pourrait être dans "
+"un état instable. Veuillez essayer \"sudo apt-get install -f\" ou utilisez "
+"synaptic pour réparer votre système."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Les mises à jour n'ont pu être téléchargées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"La mise a jour a été abandonnée maintenant. Veuillez vérifier votre "
+"connexion Internet ou votre médium d'installation, et réessayez. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Enlever les paquets obsolètes ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Erreur pendant la soumission"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Un problème est survenu lors du nettoyage. Veuillez vous reporter au message "
+"ci-dessous pour plus d'informations. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Un autre gestionnaire de paquets est en fonctionnement"
+msgstr "Vérification du gestionnaire de paquets"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Mise à jour des informations sur les dépôts en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Demande de confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Mise à jour terminée"
+msgstr "Mise à jour en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Recherche de logiciels désuets"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "La mise à jour du système est terminée."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Veuillez insérer « %s » dans le lecteur « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Le téléchargement est terminé"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Téléchargement du fichier %li sur %li à %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s restants"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Téléchargement des changements..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Installation des mises à jour"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Impossible d'installer \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
-"ceci comme étant un bug."
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "La mise à jour vient d'échouer. Merci de signaler ce bug."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Une erreur fatale est survenue"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Veuillez signaler ce bogue et joindre les fichiers ~/dist-upgrade.log et "
+"~/dist-upgrade-apt.log à votre rapport. La mise à jour s'annule maintenant. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le paquet %s va être supprimé."
+msgstr[1] "Les paquets %s vont être supprimés."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le paquet %s va être installé."
+msgstr[1] "Les paquets %s vont être installés."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le paquet %s va être mis à jour."
+msgstr[1] "Les paquets %s vont être mis à jour."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Vous devez télécharger un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"La mise à niveau peut prendre plusieurs heures et ne peut pas être annulée "
+"plus tard."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Pour éviter toute perte de données accidentelle, veuillez fermer toutes les "
+"applications ou documents ouverts."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Aucune mise à jour n'est disponible"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Votre système a des paquets cassés !"
+msgstr "Votre système a déjà été mis à jour."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Détails</b>"
+msgstr "<b>Supprimer %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Installer"
+msgstr "Installer %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Mise à jour terminée"
+msgstr "Mettre à jour %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Redémarrage de l'ordinateur requis"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 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 le faire dès maintenant?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
@@ -410,79 +415,71 @@ 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>Annuler la mise à jour en cours?</big></b>\n"
+"\n"
+"Le système pourrait devenir inutilisable si vous annulez la mise à jour. Il "
+"vous est fortement conseillé de reprendre la mise à jour."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Redémarrez votre système pour terminer la mise à jour</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Démarrer la mise à jour ?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu \"Dapper\" "
+"6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Nettoyage"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Détails</b>"
+msgstr "Détails"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Téléchargement et installation des mises à jour"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modification des canaux du logiciel"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Préparation de la mise à jour"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Redémarrage du système"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
+msgstr "Mettre à jour Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Recharger"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Rapporter un bogue"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Redémarrer Maintenant"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Mise à jour terminée"
+msgstr "_Reprendre la mise à jour"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -491,6 +488,12 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Vous devez vérifier manuellement la disponibilité de mises à "
+"jour</big></b>\n"
+"\n"
+"Votre système ne contrôle pas les mises à jour automatiquement. Vous pouvez "
+"configurer ce comportement dans \"Système\" -> \"Administration\" -> "
+"\"Propriété des programmes\""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -499,118 +502,111 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Recherche de mises à jour</b></big>\n"
+"\n"
+"Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des "
+"problèmes de sécurité et apporter de nouvelles fonctionalités."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Maintenir votre système à jour</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "_Annuler le téléchargement"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Changements"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Rechercher les mises à jour disponibles"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Description"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Notes de publication"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Montrer les détails"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Afficher l'avancement des fichiers individuels"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Mises à jour des logiciels"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des "
+"problèmes de sécurité et apporter de nouvelles fonctionalités."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "Mise à jour terminée"
+msgstr "Mettre à _jour"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Mettre à jour vers la version la plus récente d'Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Vérifier"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Masquer ces informations à l'avenir"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "_Installer"
+msgstr "_Installer les mises à jour"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Détails</b>"
+msgstr "<b>Canaux</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr "<b>Mise à jour par Internet</b>"
+msgstr "<b>Mises à jour par Internet</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Détails</b>"
+msgstr "<b>Clés</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
-msgstr "Ajouter un _cédérom"
+msgstr "Ajouter un _CD-ROM"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
-msgstr "A_uthentification"
+msgstr "Authentification"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Effacer les fichiers des logiciels téléchargés :"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Supprimer la clé sélectionnée du trousseau digne de confiance."
+msgstr ""
+"Importer la clé publique d'un fournisseur de logiciels digne de confiance"
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Installation des mises à jour..."
+msgstr "Médium d'installation"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Mise à jour par Internet</b>"
+msgstr "Mises à jour par Internet"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -618,15 +614,17 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Seules les mises à jour de sécurité des serveurs officiels d'Ubuntu seront "
+"automatiquement installées. Les autres mises à jour \"innatendues\" de "
+"logiciels devront être installées manuellement."
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Restaurer les clés par défaut"
+msgstr "Restaurer les clés par _défaut"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Restaurer les clés par défaut pour votre distribution"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -634,20 +632,20 @@ msgstr "Préférences du logiciel"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Rechercher des mises à jour automatiquement:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
+"_Télécharger des mises à jour automatiquement, mais ne pas les installer"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Installer les mises à jour de sécurité sans confirmation"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
-#, fuzzy
 msgid "     "
-msgstr "    "
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -658,29 +656,34 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Les informations des canaux sont obsolètes</big></b>\n"
+"\n"
+"Vous devez recharger les informations des canaux pour installer de nouveaux "
+"logiciels ou des mises à jour à partir des canaux modifiés ou nouvellement "
+"ajoutés.\n"
+"\n"
+"Vous devez disposer d'une connexion fonctionnelle à Internet avant de "
+"continuer."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Détails</b>"
+msgstr "<b>Canal</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
-msgstr "<b>Commentaire :</b>"
+msgstr "<b>Commentaire :</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Composants</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution :</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sections :</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Sections :</b>"
+msgstr "<b>Catégories :</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -691,16 +694,15 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI :</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez ajouter</"
-"b></big>\n"
+"<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez "
+"ajouter</b></big>\n"
 "\n"
 "La ligne APT contient le type, la source et le contenu d'un dépôt, par "
 "exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une "
@@ -712,7 +714,7 @@ msgstr "Ligne APT :"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Ajouter un canal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -724,28 +726,29 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Modifier un dépôt"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Examen du cédérom"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Ajouter un canal"
+msgstr[1] "_Ajouter des canaux"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Recharger"
+msgstr "A_ctualiser"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Afficher et installer les mises à jour disponibles"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -757,168 +760,135 @@ msgid ""
 "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 "
+"recharger manuellement la liste des dépôts de logiciels. Cette option permet "
+"de cacher la notification qui apparaît dans ce cas."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Me rappeller de recharger la liste des dépôts"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Afficher les détails d'une mise à jour"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Enregistre la taille de la fenêtre du gestionnaire de mises à jour"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Enregistre l'état de l'extendeur contenant la liste des changements et la "
+"description"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "La taille de la fenêtre"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Mises à jour de sécurité pour Ubuntu 6.06"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Mises à jour d'Ubuntu 5.04"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Mises à jour pour Ubuntu 6.06"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Mises à jour d'Ubuntu 5.04"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Mises à jour \"backports\" pour Ubuntu 6.06"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgstr "Mises à jour de sécurité d' Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Mises à jour d'Ubuntu 5.04"
+msgstr "Mises à jour d'Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Mises à jour d'Ubuntu 5.04"
+msgstr "Backports d'Ubuntu 6.06"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Supportés officiellement"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Copyright restreint"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Maintenu par la communauté (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Non-libre (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable Mises à jour de sécurité"
+msgstr "Mises à jour de sécurité de Debian 3.1 \"Sarge\""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (instable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
-msgstr "Supportés officiellement"
+msgstr "Supporté officiellement"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
+"Logiciel libre (selon les lignes directrices du projet Debian) dont les "
+"dépendances ne sont pas libre"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Installation des mises à jour..."
+msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Recharger les informations des paquets depuis le serveur"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections :</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Mises à jour des logiciels"
@@ -928,8 +898,7 @@ msgstr ""
 #~ "\n"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Téléchargement des changements</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">Téléchargement des changements</span>\n"
 #~ "\n"
 #~ "Il est nécessaire de récupérer les changement du serveur central"
 
@@ -965,13 +934,16 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Mises à jour disponibles</b></big>\n"
 #~ "\n"
-#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à "
-#~ "jour en utilisant le bouton Installer."
+#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour "
+#~ "en utilisant le bouton Installer."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Composants</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Dépôt</b>"
@@ -992,20 +964,20 @@ msgstr ""
 #~ "<big><b>Clés d'authentification</b></big>\n"
 #~ "\n"
 #~ "Vous pouvez ajouter ou enlever des clés d'authentification grâce à cette "
-#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité "
-#~ "des logiciels que vous téléchargez."
+#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité des "
+#~ "logiciels que vous téléchargez."
 
 #~ msgid "A_uthentication"
 #~ msgstr "A_uthentification"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "Ajouter une nouvelle clé au trousseau digne de confiance. Veuillez "
-#~ "vérifier que vous avez obtenu la clé à travers un canal sécurisé et que "
-#~ "vous faites confiance à son possesseur."
+#~ "Ajouter une nouvelle clé au trousseau digne de confiance. Veuillez vérifier "
+#~ "que vous avez obtenu la clé à travers un canal sécurisé et que vous faites "
+#~ "confiance à son possesseur. "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Nettoyer automatiquement les fichiers _temporaires des paquets"
@@ -1027,8 +999,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Restaurer les clés par défaut fournies avec la distribution. Les clés "
 #~ "installées par l'utilisateur ne seront pas modifiées."
@@ -1065,21 +1037,19 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "Cela signifie que d'autres actions (comme l'installation ou la "
-#~ "suppression de paquets) seront requises après la mise à jour. Veuillez "
-#~ "utiliser Synaptic « Mise à jour intelligente » ou « apt-get dist-"
-#~ "upgrade » pour régler la situation. "
+#~ "Cela signifie que d'autres actions (comme l'installation ou la suppression "
+#~ "de paquets) seront requises après la mise à jour. Veuillez utiliser Synaptic "
+#~ "« Mise à jour intelligente » ou « apt-get dist-upgrade » pour régler la "
+#~ "situation."
 
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "Les paquets suivants ne seront pas mis à jour :"
+#~ msgstr "Les paquets suivants ne seront pas mis à jour : "
 
 #~ msgid "Changes not found, the server may not be updated yet."
 #~ msgstr ""
-#~ "Changements non trouvés, le serveur n'a peut-être pas encore été mis à "
-#~ "jour."
+#~ "Changements non trouvés, le serveur n'a peut-être pas encore été mis à jour."
 
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
@@ -1091,12 +1061,15 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s : \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Téléchargement des changements..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Les mises à jour ont été appliquées."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Vous ne pouvez exécuter qu'un seul gestionnaire de paquets à la fois. "
 #~ "Veuillez tout d'abord fermer cette autre application."
@@ -1118,20 +1091,20 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Veuillez mettre à jour vers une version plus récente d'Ubuntu Linux. La "
-#~ "version que vous êtes entrain d'utiliser ne recevra pas d'autres "
-#~ "correctifs de sécurité ou mises à jour critiques. Veuillez voir http://"
-#~ "www.ubuntulinux.org pour les informations de mise à jour."
+#~ "version que vous êtes entrain d'utiliser ne recevra pas d'autres correctifs "
+#~ "de sécurité ou mises à jour critiques. Veuillez voir "
+#~ "http://www.ubuntulinux.org pour les informations de mise à jour."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Il y a une nouvelle version d'Ubuntu disponible !"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
 #~ "Une nouvelle version avec le nom de code « %s » est disponible. Veuillez "
 #~ "voir http://www.ubuntulinux.org pour les informations de mise à jour."
@@ -1141,8 +1114,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
 #~ "Vous ne pouvez exécuter qu'un seul gestionnaire de paquets à la fois. "
 #~ "Veuillez tout d'abord fermer cette autre application."
@@ -1195,28 +1168,28 @@ msgstr ""
 #~ msgstr "Les dépôts ont été modifiés"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "Les informations des dépôts ont changés. Une sauvegarde de votre sources."
-#~ "list à été copiée à %s.save. \n"
+#~ "Les informations des dépôts ont changés. Une sauvegarde de votre "
+#~ "sources.list à été copiée à %s.save. \n"
 #~ " \n"
-#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que "
-#~ "vos changements soient effectifs. Voulez-vous le faire maintenant ?"
+#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que vos "
+#~ "changements soient effectifs. Voulez-vous le faire maintenant ?"
 
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Mises à jour disponibles</b></big>\n"
 #~ "\n"
-#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à "
-#~ "jour en utilisant le bouton Installer."
+#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour "
+#~ "en utilisant le bouton Installer."
 
 #~ msgid "0"
-#~ msgstr "0"
+#~ msgstr "0"
\ No newline at end of file
diff --git a/po/gl.po b/po/gl.po
index 7e361d24..fefada73 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-12-02 15:59+0100\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:18+0000\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego\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=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
@@ -27,31 +27,32 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Erro importando o ficheiro seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Erro ao quitar a clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -59,11 +60,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -85,7 +86,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -97,40 +97,38 @@ msgid ""
 "this as a bug. "
 msgstr ""
 "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro."
+"erro. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 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."
+"erro. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -143,7 +141,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -191,205 +188,184 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Xa hai outro xestor de paquetes en execución"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualización rematada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Descargando cambios..."
+msgid "Installing updates"
+msgstr "Instalando actualizacións..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
 "erro."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Claves</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Instalar"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Actualización rematada"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -397,11 +373,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -421,8 +396,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -435,51 +410,38 @@ msgid "Details"
 msgstr "<b>Detalles</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Recargar"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -512,57 +474,53 @@ msgid "Changes"
 msgstr "Cambios"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "Comprobando se hai actualizacións..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Descrición"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Actualizacións de software"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Instalando actualizacións..."
@@ -634,7 +592,7 @@ msgid "_Check for updates automatically:"
 msgstr "Comprobar se hai actualizacións cada"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -643,7 +601,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -665,14 +623,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Comentario:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Compoñentes</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribución:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Seccións:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -689,14 +646,14 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Introduza a liña completa do repositorio APT que quere engadir</b></"
-"big>\n"
+"<big><b>Introduza a liña completa do repositorio APT que quere "
+"engadir</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 "
@@ -728,7 +685,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -776,145 +735,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Actualizacións de Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Soporte oficial"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Dereito de copia restrinxido"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Mantido pola comunidade (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Non libre (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Actualizacións de seguranza de Debian estable"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian de probas"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Inestable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Soporte oficial"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Instalando actualizacións..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Recargar a información do paquete desde o servidor."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seccións:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizacións de software"
@@ -924,8 +853,7 @@ msgstr ""
 #~ "\n"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</span>\n"
 #~ "\n"
 #~ "Necesítanse descargar os trocos do servidor actual"
 
@@ -952,6 +880,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "día(s)"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Compoñentes</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repositorio</b>"
 
@@ -969,15 +900,15 @@ msgstr ""
 #~ 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."
+#~ "Pode engadir e quitar claves de autenticación desde este diálogo. Unha clave "
+#~ "fai posible verificar a integridade do software que descarga."
 
 #~ 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. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "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."
+#~ "obtivo a clave a través dun canle seguro e que confía no propietario. "
 
 #~ msgid "Add repository..."
 #~ msgstr "Engadir repositorio..."
@@ -1004,8 +935,8 @@ msgstr ""
 #~ msgstr "Tamaño máximo en MB:"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Recupera as claves entregadas orixinalmente coa distribución. Isto non "
 #~ "cambiará as claves instaladas polo usuario."
@@ -1023,7 +954,7 @@ msgstr ""
 #~ msgstr "Amosar fontes de software desactivado"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "Intervalo de actualización en días:"
+#~ msgstr "Intervalo de actualización en días: "
 
 #~ msgid "_Add Repository"
 #~ msgstr "_Engadir repositorio"
@@ -1037,13 +968,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Actualizacións dispoñibles</b></big>\n"
 #~ "\n"
-#~ "O xestor de actualizacións atopou os seguintes paquetes actualizables. "
-#~ "Pode actualizalos usando o botón Instalar."
+#~ "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"
@@ -1099,8 +1030,7 @@ msgstr ""
 
 #~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
 #~ msgstr ""
-#~ "Clave de asinado automático das imaxes de CD de Ubuntu <cdimage@ubuntu."
-#~ "com>"
+#~ "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"
@@ -1115,7 +1045,10 @@ msgstr ""
 #~ msgstr "Hai %s paquetes dispoñibles para ser actualizados."
 
 #~ msgid "Version %s: \n"
-#~ msgstr "Versión %s:\n"
+#~ msgstr "Versión %s: \n"
+
+#~ msgid "Downloading changes..."
+#~ msgstr "Descargando cambios..."
 
 #~ msgid "There are no updated packages"
 #~ msgstr "Non hai paquetes actualizados"
@@ -1131,8 +1064,7 @@ msgstr ""
 #~ msgstr[1] "Seleccionou %s paquetes actualizables, de tamaño total %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ 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"
 
@@ -1140,11 +1072,11 @@ msgstr ""
 #~ msgstr "Estanse aplicando as actualizacións."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Só pode executar unha aplicación de xestión de paquetes ao mesmo tempo. "
-#~ "Por favor peche a outra aplicación primeiro."
+#~ "Só pode executar unha aplicación de xestión de paquetes ao mesmo tempo. Por "
+#~ "favor peche a outra aplicación primeiro."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Actualizando a lista de paquetes..."
@@ -1160,35 +1092,35 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "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."
+#~ "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 "There is a new release of Ubuntu available!"
 #~ msgstr "Hai unha versión nova de Ubuntu dispoñible!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "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."
+#~ "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 "Never show this message again"
 #~ msgstr "Non amosar máis esta mensaxe"
 
 #~ 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."
+#~ "Non se atopou o informe de cambios, pode que o servidor non esté actualizado "
+#~ "aínda."
 
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
-#~ "Fallou ao descargar o informe de cambios. Comprobe se ten algunha "
-#~ "conexión activa."
+#~ "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión "
+#~ "activa."
\ No newline at end of file
diff --git a/po/he.po b/po/he.po
index 4f64e5e7..82919f20 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,59 +10,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-08-07 14:49+0300\n"
-"Last-Translator: Yuval Tanny\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-25 18:19+0000\n"
+"Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "כל %s ימים"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "אחרי %s ימים"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "שגיאה בייבוא קובץ נבחר"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "שגיאה בהסרת המפתח"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>שגיאה בסריקת התקליטור</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -84,7 +88,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -94,38 +97,36 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
+msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "לא ניתן להתקין את \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
+msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -138,7 +139,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -160,19 +160,20 @@ msgid ""
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "שגיאה בהסרת המפתח"
+msgstr "שגיאה במהלך העדכון"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 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:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "אין מספיק שטח בדיסק הקשיח"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -186,203 +187,180 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "מנהל חבילות אחר רץ"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "השדרוג הסתיים"
+msgstr "משדרג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "שדרוג המערכת הושלם."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "ההורדה הושלמה"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s נותרו"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "מוריד קובץ %li מתוך %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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "מוריד שינויים..."
+msgid "Installing updates"
+msgstr "מתקין עדכונים..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>מפתחות</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_התקן"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "השדרוג הסתיים"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -390,11 +368,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -414,8 +391,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -428,51 +405,38 @@ msgid "Details"
 msgstr "<b>פרטים</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "טען מחדש"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -505,57 +469,53 @@ msgid "Changes"
 msgstr "שינויים"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "בודק אם יש עדכונים..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "תיאור"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "עדכוני תוכנה"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "מתקין עדכונים..."
@@ -627,7 +587,7 @@ msgid "_Check for updates automatically:"
 msgstr "בדוק לעדכונים כל"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -636,7 +596,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -658,14 +618,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>הערות:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>רכיבים</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>הפצה:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>מחלקה:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -682,16 +641,16 @@ msgstr "<b>כתובת:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n"
 "\n"
-"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb http://ftp.debian."
-"org sarge main\"</i>\n"
+"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb "
+"http://ftp.debian.org sarge main\"</i>\n"
 "אפשר למצוא הסבר מפורט על זה בתיעוד."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
@@ -720,7 +679,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -768,145 +729,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "עדכונים - אובונטו 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "נתמך רשמית"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "זכויות יוצרים מגבילות"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "מתוחזק ע\"י קהילה (Universe("
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "לא-חופשי (Multiverse("
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "דביאן 3.1 \"סארג'\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "עדכוני אבטחה - דביאן יציב"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "דביאן בדיקה"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "דביאן לא ארה\"ב (לא יציב)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "נתמך רשמית"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "מתקין עדכונים..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "טען מחדש את המידע על החבילה מהשרת"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>מחלקה:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "עדכוני תוכנה"
@@ -943,6 +874,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ימים"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>רכיבים</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>מאגר</b>"
 
@@ -964,11 +898,11 @@ msgstr ""
 #~ "תקינות התוכנה שאתה מוריד."
 
 #~ 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. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "הוסף קובץ מפתח חדש לרשימת המפתחות שאתה בוטח בהם. אנא וודא שאתה שקיבלת את "
-#~ "המפתח בדרך מאובטחת ושאתה בוטח בבעלים."
+#~ "המפתח בדרך מאובטחת ושאתה בוטח בבעלים. "
 
 #~ msgid "Add repository..."
 #~ msgstr "הוסף מאגר..."
@@ -980,7 +914,7 @@ msgstr ""
 #~ msgstr "_נקה קבצים זמניים של חבלות באופן אוטומטי."
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "משך זמן בימים בין הניקיונות:"
+#~ msgstr "משך זמן בימים בין הניקיונות: "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "_מחק חבילות ישנות שנמצאות במטמון החבילות"
@@ -989,14 +923,14 @@ msgstr ""
 #~ msgstr "ערוך מאגר..."
 
 #~ msgid "Maximum age in days:"
-#~ msgstr "גיל מקסימלי בימים: "
+#~ msgstr "גיל מקסימלי בימים:"
 
 #~ msgid "Maximum size in MB:"
 #~ msgstr "גודל מקסימלי במגה-בתים:"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "שחזר את מפתחות ברירת המחדל שבאו עם ההפצה. זה לא ישנה את המפתחות המותקנים."
 
@@ -1013,7 +947,7 @@ msgstr ""
 #~ msgstr "הראה פירוט מקורות תוכנה"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "משך זמן בימים בין העדכונים:"
+#~ msgstr "משך זמן בימים בין העדכונים: "
 
 #~ msgid "_Add Repository"
 #~ msgstr "_הוסף מאגר"
@@ -1027,8 +961,8 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>עדכונים זמינים</b></big>\n"
 #~ "\n"
@@ -1111,7 +1045,10 @@ msgstr ""
 #~ msgstr "אפשר לעדכן %s חבילות"
 
 #~ msgid "Version %s: \n"
-#~ msgstr "גרסה %s:\n"
+#~ msgstr "גרסה %s: \n"
+
+#~ msgid "Downloading changes..."
+#~ msgstr "מוריד שינויים..."
 
 #~ msgid "There are no updated packages"
 #~ msgstr "אין חבילות מעודכנות"
@@ -1127,8 +1064,7 @@ msgstr ""
 #~ msgstr[1] "בחרת את כל %s החבילות המעודכנות, בגודל כולל של %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ msgid_plural "You have selected %s out of %s updated packages, total size %s"
 #~ msgstr[0] "בחרת %s מתוך חבילה מעודכנת אחת, בגודל של %s"
 #~ msgstr[1] "בחרת %s מתוך %s חבילות מעודכנות, בגודל כולל של %s"
 
@@ -1136,8 +1072,8 @@ msgstr ""
 #~ msgstr "העדכונים מתבצעים כרגע."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "אפשר להריץ רק מנהל חבילות אחד באותו זמן. אנא סגור מנהלי חבילות אחרים קודם."
 
@@ -1155,19 +1091,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת "
-#~ "עדכוני אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org "
-#~ "בשביל מידע אודות שדרוג."
+#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת עדכוני "
+#~ "אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org בשביל "
+#~ "מידע אודות שדרוג."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "גרסה חדשה של אובונטו זמינה!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
 #~ "הפצה חדשה עם שם קוד '%s' זמינה. אנא ראה http://www.ubuntulinux.org/ בשביל "
 #~ "הוראות שדרוג."
@@ -1181,4 +1117,4 @@ msgstr ""
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
-#~ msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
+#~ msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
\ No newline at end of file
diff --git a/po/hu.po b/po/hu.po
index c5b08ea5..488868ae 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,125 +7,130 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-04-03 12:32+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 12:21+0000\n"
+"Last-Translator: Tamás Nepusz <nepusz@mit.bme.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "%s naponta"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "%s nap után"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Kulcs importálása"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Hiba a kiválasztott fájl importálása közben"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Hiba a kulcs eltávolítása közben"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+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:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Hiba történt a CD beolvasása közben</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Kérem, adja meg a lemez nevét"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Törött csomagok"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"Az Ön rendszere törött csomagokat tartalmaz, amelyek ezzel a szoftverrel nem "
+"javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-get "
+"segítségével."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "A szükséges meta-csomagok nem frissíthetőek"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Egy alapvető csomag eltávolításra kerülne"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Nem tudom megtervezni a frissítés menetét"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
+"A frissítés megtervezése közben feloldhatatlan probléma lépett fel. Kérem, "
+"jelentse ezt hibaként. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Hiba történt néhány csomag hitelesítése közben"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Néhány csomagot nem sikerült hitelesíteni. Lehetséges, hogy ezt átmeneti "
+"hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi "
+"lista a hitelesíthetetlen csomagokat tartalmazza."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "'%s' nem telepíthető"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr ""
-"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
+msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Nem tudom megállapítani a meta-csomagot"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -133,46 +138,55 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Az Ön rendszere nem tartalmazza az ubuntu-desktop, kubuntu-desktop vagy "
+"edubuntu-desktop csomagok egyikét sem, és nem lehetett megállapítani, hogy "
+"az Ubuntu mely változatát használja.\n"
+" Kérem, előbb telepítse a fenti csomagok egyikét a synaptic vagy az apt-get "
+"használatával."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Gyorsítótár beolvasása"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Nincs érvényes bejegyzés"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"A csomagtároló információk olvasása közben nem találtam a frissítésre "
+"vonatkozó érvényes bejegyzést.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Érvénytelen csomagtároló információ"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, "
+"jelentse ezt hibaként."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Hiba a kulcs eltávolítása közben"
+msgstr "Hiba történt a frissítés közben"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. "
+"Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Nincs elég szabad hely a merevlemezen"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -181,219 +195,210 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"A frissítés most félbeszakad. Kérem, szabadítson fel legalább %s helyet a "
+"merevlemezen. Ürítse ki a kukát és távolítsa el az előző telepítésekből "
+"származó átmeneti csomagokat a 'sudo apt-get clean' parancs használatával."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Biztosan el szeretné kezdeni a frissítést?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "A frissítések nem telepíthetőek"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan "
+"állapotban van. Az esetleges hibákat a 'sudo apt-get install -f' vagy a "
+"Synaptic használatával javíthatja ki."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "A frissítések nem tölthetőek le"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy "
+"a telepítő médiát és próbálja újra. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Eltávolítsam az elavult csomagokat?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Hiba a módosítások rögzítése közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"A frissítés befejező fázisa közben hiba lépett fel. Az alábbi üzenet további "
+"információkat tartalmaz a hibára vonatkozóan. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Már fut egy másik csomagkezelő"
+msgstr "Csomagkezelő ellenőrzése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Csomagtároló információ frissítése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Megerősítés kérése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "A frissítés befejeződött"
+msgstr "Frissítés folyamatban"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Elavult szoftverek keresése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "A rendszer frissítése befejeződött."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Helyezze be a következő médiát: '%s', ebbe a meghajtóba: '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "A letöltés befejeződött"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s van hátra"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: ismeretlen"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Módosítások letöltése..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Frissítések telepítése"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "'%s' nem telepíthető"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
+msgstr "A frissítés félbeszakadt. Kérem, jelentse ezt hibaként."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Végzetes hiba történt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Kérem, jelentse ezt hibaként és a hibajelentéshez mellékelje a ~/dist-"
+"upgrade.log és ~/dist-upgrade-apt.log fájlokat. A frissítés most "
+"félbeszakad. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
+msgstr[0] "%s csomag el lesz távolítva."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
+msgstr[0] "%s új csomag kerül telepítésre."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
+msgstr[0] "%s csomag frissítve lesz."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Összes letöltendő adatmennyiség: %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "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 "
+"megszakítani."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott "
+"alkalmazást és dokumentumot."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Nincs elérhető frissítés"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "A rendszerén törött csomagok vannak!"
+msgstr "Az Ön rendszere már frissítve lett."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Részletek</b>"
+msgstr "<b>%s eltávolítása</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Telepítés"
+msgstr "%s telepítése"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "A frissítés befejeződött"
+msgstr "%s frissítése"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Újraindítás szükséges"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"A frissítés elkészült, de a befejezéshez újra kell indítani a rendszert. "
+"Újraindítja most?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -402,79 +407,70 @@ 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>Megszakítja a folyamatban lévő frissítést?</big></b>\n"
+"\n"
+"A rendszer használhatatlan állapotban maradhat, ha megszakítja a frissítést. "
+"Erősen javasoljuk, hogy folytassa a frissítést."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>Indítsa újra a rendszert a frissítés befejezéséhez</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Megkezdi a frissítést?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu \"Dapper\" 6.04 "
+"változatra</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Frissítés befejezése"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
 msgstr "<b>Részletek</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Frissítések letöltése és telepítése"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Szoftvercsatornák módosítása"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Frissítés előkészítése"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "A rendszer újraindítása"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminál"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
+msgstr "Az Ubuntu frissítése"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Újratöltés"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Hibabejelentés"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "Újrain_dítás most"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "A frissítés befejeződött"
+msgstr "Frissítés _folytatása"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -483,6 +479,12 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Önnek kézzel kell megkeresnie a rendelkezésre álló "
+"frissítéseket</big></b>\n"
+"\n"
+"Az Ön rendszere jelenleg nem keresi automatikusan a frissítéseket. Ezt a "
+"viselkedést a \"Rendszer\" -> \"Adminisztráció\" -> \"Szoftverbeállítások\" "
+"menüpont alatt változtathatja meg."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -491,118 +493,110 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Rendelkezésre álló frissítések keresése</b></big>\n"
+"\n"
+"A szoftverfrissítések javítják az időközben felfedezett programhibákat, "
+"sebezhetőségeket és új szolgáltatásokat is biztosítanak Önnek."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Tartsa naprakészen a rendszerét</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Letöltés _megszakítása"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Módosítások"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Rendelkezésre álló frissítések ellenőrzése"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Leírás"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Kiadási megjegyzések"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Részletek megjelenítése"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Egyes fájlok állapotának mutatása"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Szoftverfrissítések"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"A szoftverfrissítések kijavítják az időközben felfedezett programhibákat, "
+"sebezhetőségeket és új szolgáltatásokat is biztosítanak Önnek."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "A frissítés befejeződött"
+msgstr "_Frissítés"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Frissítés az Ubuntu legújabb változatára"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Ellenőrzés"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_A jövőben ne mutassa ezt az információt"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
 msgstr "_Telepítés"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Részletek</b>"
+msgstr "<b>Csatornák</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr "<b>Internetes frissítések</b>"
+msgstr "<b>Hálózati frissítések</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Részletek</b>"
+msgstr "<b>Kulcsok</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
 msgstr "_CD hozzáadása"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
-msgstr "_Hitelesítés"
+msgstr "Hitelesítés"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "L_etöltött csomagok törlése:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "A kijelölt kulcs eltávolítása a megbízható kulcstartóról."
+msgstr "Megbízható szoftverszolgáltató publikus kulcsának importálása"
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Frissítések telepítése..."
+msgstr "Telepítő média"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Internetes frissítések</b>"
+msgstr "Hálózati frissítések"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -610,15 +604,17 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Mivel csak az Ubuntu szervereiről származó biztonsági frissítések kerülnek "
+"automatikusan telepítésre, telepíteni kell az \"unattended-upgrades\" "
+"csomagot is"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Alapértelmezett kulcsok visszaállítása"
+msgstr "_Alapértelmezés visszaállítása"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "A disztribúcióra jellemző alapértelmezett kulcsok visszaállítása"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -626,19 +622,19 @@ msgstr "Szoftver beállításai"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Frissítések automatikus keresése:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "Frissítések _letöltése a háttérben, telepítés nélkül"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Biztonsági frissítések telepítése megerősítés nélkül"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -649,29 +645,32 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>A csatornainformáció elévült</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"
+"\n"
+"A folytatáshoz működő hálózati kapcsolatra van szükség."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Részletek</b>"
+msgstr "<b>Csatorna</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Megjegyzés:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Összetevők</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Disztribúció:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Csoportok:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Csoportok:</b>"
+msgstr "<b>Csoportok</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -682,18 +681,17 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Adja meg a felvenni kívánt tároló teljes APT sorát</b></big>\n"
 "\n"
-"Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például <i>"
-"\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes "
+"Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes "
 "leírását a dokumentációban találhatja meg."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
@@ -702,7 +700,7 @@ msgstr "APT sor:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Csatorna hozzáadása"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -714,28 +712,28 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Csatorna szerkesztése"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "CD-ROM átvizsgálása"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "Csatorna hozzá_adása"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Újratöltés"
+msgstr "F_rissítés"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Rendelkezésre álló frissítések megjelenítése és telepítése"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -747,168 +745,137 @@ msgid ""
 "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."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Figyelmeztessen, ha újra kell tölteni a csatornalistát"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Frissítés részleteinek megjelenítése"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "A frissítéskezelő ablak méretének tárolása"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Eltárolja a változások listáját és a megnevezéseket tartalmazó lista "
+"kiterjesztőjének állapotát"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Az ablak mérete"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 biztonsági frissítések"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 frissítések"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 visszaportolt csomagok"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgstr "Ubuntu 5.10 biztonsági frissítések"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgstr "Ubuntu 5.10 frissítések"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgstr "Ubuntu 5.10 visszaportolt csomagok"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Hivatalosan támogatott"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Szerzői jogi korlátozás alatt"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Közösségi karbantartású (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Nem-szabad (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Stabil Debian biztonsági frissítések"
+msgstr "Debian 3.1 \"Sarge\" biztonsági frissítések"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (tesztelés alatt)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (instabil)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Hivatalosan támogatott"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Frissítések telepítése..."
+msgstr "Nem DFSG-kompatibilis szoftver"
 
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Csoportok:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Szoftverfrissítések"
@@ -920,7 +887,7 @@ msgstr ""
 #~ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Módosítások letöltése</span>\n"
 #~ "\n"
-#~ "A módosításokat le kell tölteni a központi kiszolgálóról "
+#~ "A módosításokat le kell tölteni a központi kiszolgálóról"
 
 #~ msgid "Show available updates and choose which to install"
 #~ msgstr "Rendelkezésre álló frissítések mutatása és telepítése"
@@ -954,14 +921,17 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Elérhető frissítések</b></big>\n"
 #~ "\n"
 #~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével "
 #~ "frissítheti őket."
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Összetevők</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Tároló</b>"
 
@@ -989,12 +959,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Új kulcsfájl hozzáadása a megbízható kulcstartóhoz. Győződjön meg, hogy a "
-#~ "kulcsot biztonságos csatornán keresztül kapta és megbízik a "
-#~ "tulajdonosban. "
+#~ "kulcsot biztonságos csatornán keresztül kapta és megbízik a tulajdonosban. "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Átmeneti csomagfájlok automatikus _törlése"
@@ -1016,11 +985,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "A disztribúcióval szállított alapértelmezett kulcsok visszaállítása. Ez "
-#~ "nem változtatja meg a felhasználó által telepített kulcsokat."
+#~ "A disztribúcióval szállított alapértelmezett kulcsok visszaállítása. Ez nem "
+#~ "változtatja meg a felhasználó által telepített kulcsokat."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "A csomaggyorsítótár legnagyobb _méretének beállítása"
@@ -1054,12 +1023,11 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "Ez azt jelenti, hogy a csomagok frissítése mellett néhány további művelet "
-#~ "is szükséges (például csomagok telepítése vagy törlése). Kérem használja "
-#~ "a Synaptic \"Intelligens frissítés\" lehetőségét, vagy az \"apt-get dist-"
+#~ "Ez azt jelenti, hogy a csomagok frissítése mellett néhány további művelet is "
+#~ "szükséges (például csomagok telepítése vagy törlése). Kérem használja a "
+#~ "Synaptic \"Intelligens frissítés\" lehetőségét, vagy az \"apt-get dist-"
 #~ "upgrade\" parancsot a probléma megoldására."
 
 #~ msgid "The following packages are not upgraded: "
@@ -1073,21 +1041,24 @@ msgstr ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
-#~ "Nem sikerült a módosításokat letölteni. Kérem ellenőrizze, hogy aktív-e "
-#~ "az internetkapcsolata."
+#~ "Nem sikerült a módosításokat letölteni. Kérem ellenőrizze, hogy aktív-e az "
+#~ "internetkapcsolata."
 
 #~ msgid "Version %s: \n"
 #~ msgstr "%s verzió: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Módosítások letöltése..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "A frissítések alkalmazása folyamatban."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb "
-#~ "zárja be a másik alkalmazást."
+#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb zárja "
+#~ "be a másik alkalmazást."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Csomaglista frissítése..."
@@ -1106,34 +1077,34 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Kérem frissítse rendszerét az Ubuntu Linux újabb verziójára. Az Ön által "
 #~ "használt verzió már nem fog biztonsági javításokat vagy egyéb kritikus "
-#~ "frissítéseket kapni. Kérem keresse fel a http://www.ubuntulinux.org "
-#~ "oldalt a frissítési információkért."
+#~ "frissítéseket kapni. Kérem keresse fel a http://www.ubuntulinux.org oldalt a "
+#~ "frissítési információkért."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Az Ubuntu egy új kiadása áll rendelkezésre!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "Egy új, \"%s\" kódnevű kiadás áll rendelkezésre. A frissítési "
-#~ "utasításokért keresse fel a http://www.ubuntulinux.org/ webhelyet."
+#~ "Egy új, \"%s\" kódnevű kiadás áll rendelkezésre. A frissítési utasításokért "
+#~ "keresse fel a http://www.ubuntulinux.org/ webhelyet."
 
 #~ msgid "Never show this message again"
 #~ msgstr "Ne mutassa többé ezt az üzenetet"
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb "
-#~ "zárja be a másik alkalmazást."
+#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb zárja "
+#~ "be a másik alkalmazást."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Inicializálás és a frissítések letöltése..."
@@ -1181,25 +1152,25 @@ msgstr ""
 #~ msgstr "Megváltoztak a tárolók"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "A tárolóinformációk megváltoztak. A sources.list biztonsági másolata %s."
-#~ "save néven van elmentve.\n"
+#~ "A tárolóinformációk megváltoztak. A sources.list biztonsági másolata %s.save "
+#~ "néven van elmentve.\n"
 #~ "\n"
-#~ "A csomaglistákat újra le kell tölteni a kiszolgálókról, hogy a "
-#~ "változtatások életbe lépjenek. Meg akarja ezt tenni most?"
+#~ "A csomaglistákat újra le kell tölteni a kiszolgálókról, hogy a változtatások "
+#~ "életbe lépjenek. Meg akarja ezt tenni most?"
 
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Elérhető frissítések</b></big>\n"
 #~ "\n"
 #~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével "
-#~ "frissítheti őket."
+#~ "frissítheti őket."
\ No newline at end of file
diff --git a/po/it.po b/po/it.po
index 11ba78ef..57405986 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,135 +2,140 @@
 # Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
 # This file is distributed under the same license as the update-manager package.
 # Fabio Marzocca <thesaltydog@gmail.com>, 2005.
-# 
-# 
-# 
+#
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-10-26 12:25+0200\n"
-"Last-Translator: Fabio Marzocca <thesaltydog@gmail.com>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-26 17:46+0000\n"
+"Last-Translator: Maurizio Moriconi <bugman@tiscali.it>\n"
 "Language-Team: Italian <it@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:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Ogni %s giorni"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Dopo %s giorni"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Importa chiave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
-msgstr "Errore nell'importazione del file selezionato"
+msgstr "Errore durante l'importazione del file selezionato"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe "
 "essere corrotto."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
-msgstr "Errore rimuovendo la chiave"
+msgstr "Errore durante la rimozione della chiave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"La chiave selezionata non può essere rimossa. Per favore riporta questo come "
-"bug."
+"La chiave selezionata non può essere rimossa. Notificare questo come bug"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Errore durante la lettura del CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Inserire un nome per il disco"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Inserire un disco nell'unità:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Pacchetti non integri"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"Il sistema contiene pacchetti non integri che non possono essere aggiustati "
+"con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-"
+"get\" per aggiustarli."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Impossibile aggiornare i meta-pacchetti richiesti"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Un pacchetto essenziale dovrebbe essere rimosso"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Impossibile calcolare l'aggiornamento"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"La chiave selezionata non può essere rimossa. Per favore riporta questo come "
-"bug."
+"Si è verificato un problema irrisolvibile calcolando l'aggiornamento. Per "
+"favore segnala questo come bug. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Errore durante l'autenticazione di alcuni pacchetti"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Non è stato possibile autenticare alcuni pacchetti. Questo potrebbe essere "
+"un problema di rete passeggero. Riprovare più tardi. Segue una lista di "
+"pacchetti non autenticati."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Impossibile installare \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"La chiave selezionata non può essere rimossa. Per favore riporta questo come "
-"bug."
+"Non è stato possibile installare un pacchetto richiesto. Per favore riporta "
+"questo come bug. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Impossibile indovinare il meta-pacchetto"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -138,46 +143,55 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Il sistema non contiene un pacchetto ubuntu-desktop, kubuntu-desktop o "
+"edubuntu-desktop e non è stato possibile riconoscere la versione di ubuntu "
+"in esecuzione.\n"
+" Prima di procedere, usare synaptic o apt-get per installare uno dei "
+"pacchetti menzionati."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Lettura della cache"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Nessuna voce valida trovata."
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Durante la scansione delle informazioni sui repository, non è stata trovata "
+"alcuna voce valida per l'aggiornamento.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Informazioni sul repository non valide"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"L'aggiornamento delle informazioni sul repository ha generato un file non "
+"valido. Per favore segnala questo come bug."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Errore rimuovendo la chiave"
+msgstr "Errore durante l'aggiornamento"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Si è verificato un problema durante l'aggiornamento. Solitamente si tratta "
+"di problemi di rete, controllare la connessione di rete e riprovare."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Spazio libero insufficiente"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -186,222 +200,213 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"L'aggiornamento dev'essere interrotto ora. Occorre liberare almeno %s di "
+"spazio sul disco. Svuotare il cestino e rimuovere i pacchetti temporanei "
+"delle passate installazioni usando 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Iniziare l'aggiornamento?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Impossibile installare gli aggiornamenti"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"L'aggiornamento dev'essere interrotto ora. Il sistema potrebbe essere in uno "
+"stato inutilizzabile. Per aggiustare il sistema, provare ad usare 'sudo apt-"
+"get install -f' o Synaptic"
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Impossibile scaricare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"L'aggiornamento termina ora. Controllare la connessione internet o il "
+"supporto di installazione e riprovare. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Rimuovere i pacchetti obsoleti?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Errore durante il commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Si sono verificati alcuni problemi durante la pulizia. Leggere il messaggio "
+"seguente per maggiori informazioni. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Un altro gestore di pacchetti è in esecuzione"
+msgstr "Controllo gestore dei pacchetti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Aggiornamento delle informazione sui repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Richiesta di conferma"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Aggiornamento terminato"
+msgstr "Aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Ricerca software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "L'aggiornamento del sistema è stato completato."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Inserire '%s' nell'unità '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Download completato"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Download del file %li di %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s rimanenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Download del file %li di %li a velocità sconosciuta"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Download modifiche in corso..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Installazione degli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Impossibile installare '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
-"La chiave selezionata non può essere rimossa. Per favore riporta questo come "
-"bug."
+"L'aggiornamento viene interrotto ora. Per favore riporta questo come bug."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Si è verificato un errore fatale"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#, fuzzy
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Per favore riporta questo come bug e includi nella segnalazione i file "
+"~/dist-upgrade.log e ~/dist-upgrade-apt.log . L'aggiornamento termina ora. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verrà rimosso %s pacchetto."
+msgstr[1] "Verranno rimossi %s pacchetti."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verrà installato %s nuovo pacchetto."
+msgstr[1] "Verranno installati %s nuovi pacchetti."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verrà aggiornato %s pacchetto."
+msgstr[1] "Verranno aggiornati %s pacchetti."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "È necessario scaricare un totale di %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 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."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Impossibile trovare aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "Il sistema è già stato aggiornato."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Chiavi</b>"
+msgstr "<b>Rimuovi %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Installa"
+msgstr "Installa %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Aggiornamento terminato"
+msgstr "Aggiorna %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Riavvio richiesto"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
-msgstr ""
+msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -410,78 +415,71 @@ 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>Annullare l'aggiornamento in corso?</big></b>\n"
+"\n"
+"Il sistema potrebbe essere inutilizzabile se l'aggiornamento viene "
+"annullato. Si consiglia fortemente la ripresa dell'aggiornamento."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Riavviare il sistema per completare l'aggiornamento</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Avviare l'aggiornamento?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Aggiornamento ad Ubuntu \"Dapper\" "
+"6.04</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Pulizia in corso"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Dettagli</b>"
+msgstr "Dettagli"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Download ed installazione degli aggiornamenti in corso"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modifica i canali software"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Preparazione dell'aggiornamento in corso"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Riavvio del sistema in corso"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminale"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Ricarica"
+msgstr "Aggiornamento Ubuntu in corso"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Riporta bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Riavvia ora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Riprendi l'aggiornamento"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -498,79 +496,79 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Controllo aggiornamenti disponibili in corso</b></big>\n"
+"\n"
+"Gli aggiornamenti del software possono correggere errori, eliminare "
+"vulnerabilità di sicurezza e fornire nuove funzionalità."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Mantenere aggiornato il sistema</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Annulla _download"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
-msgstr "Modifiche"
+msgstr "Cambiamenti"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "Verifica degli aggiornamenti..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Note alla Release"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Visualizza dettagli"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Visualizza avanzamento dei singoli file"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Aggiornamenti Software"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Gli aggiornamenti software possono correggere errori, eliminare "
+"vulnerabilità di sicurezza e fornire nuove funzionalità"
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr ""
+msgstr "A_ggiorna"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Aggiorna all'ultima versione di Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Controlla"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Nascondi queste informazioni in futuro"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "Installazione degli aggiornamenti..."
+msgstr "_Installa aggiornamenti"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Chiavi</b>"
+msgstr "<b>Canali</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
 #, fuzzy
@@ -583,7 +581,7 @@ msgstr "<b>Chiavi</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "Aggiungi _CD-ROM"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -591,21 +589,19 @@ msgstr "Autenticazione"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Elimina i file di software scaricati:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Rimuovi la chiave selezionata dal portachiavi fidato"
+msgstr "Importa la chiave pubblica da un fornitore di software fidato"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr "Supporto di Installazione "
+msgstr "Supporto di installazione"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Aggiornamenti Internet</b>"
+msgstr "Aggiornamenti Internet"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -613,37 +609,37 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"L'installazione automatica è limitata ai soli aggiornamenti di sicurezza "
+"provenienti dai server Ubuntu ufficiali. Il pacchetto software \"unattended-"
+"upgrades\" deve perciò essere installato"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Ripristina valori iniziali"
+msgstr "Ripristina predefinite"
 
 #: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "Ripristina le chiavi di default"
+msgstr "Ripristina le chiavi predefinite della tua distribuzione"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
 msgstr "Preferenze software"
 
 #: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "Verifica aggiornamenti ogni"
+msgstr "_Verificare aggiornamenti automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Scaricare gli aggiornamenti in background, ma non installarli"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Installa gli aggiornamenti di sicurezza senza richiedere conferma"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -654,29 +650,32 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Le informazioni sul canale non sono aggiornate</big></b>\n"
+"\n"
+"Ricaricare le informazioni sul canale per installare il software e gli "
+"aggiornamenti provenienti dai canali aggiunti o modificati. \n"
+"\n"
+"Una connessione Internet funzionante è necessaria per continuare."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Chiavi</b>"
+msgstr "<b>Canale</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Commento:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Componenti</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribuzione:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sezioni:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Sezioni:</b>"
+msgstr "<b>Sezioni</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -687,20 +686,18 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Inserisci la linea APT completa del repository che vuoi aggiungere</"
-"b></b>\n"
+"<big><b>Inserire la linea APT completa del canale che si vuole "
+"aggiungere</b></big>\n"
 "\n"
-"La linea APT contiene il tipo, la locazione e il contenuto di un repository, "
-"ad esempio <i>\"deb http://ftp.debian.org sarge main\"</i>. Puoi trovare una "
-"descrizione dettagliata della sintassi nella documentazione."
+"La riga APT contiene il tipo, la locazione e il contenuto di un canale, ad "
+"esempio <i>\"deb http://ftp.debian.org sarge main\"</i>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -708,7 +705,7 @@ msgstr "Riga APT:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Aggiungi canale"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -720,28 +717,29 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Modifica canale"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Scansione CD-ROM in corso"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Aggiungi Canale"
+msgstr[1] "_Aggiungi Canali"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Ricarica"
+msgstr "_Ricarica"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Visualizza e installa gli aggiornamenti disponibili"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -753,167 +751,131 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Se il controllo automatico degli aggiornamenti è disabilitato, è necessario "
+"ricaricare manualmente la lista dei canali. Questa opzione consente di "
+"nascondere il promemoria mostrato in questo caso."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Ricorda di ricaricare la lista dei canali"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Mostra i dettagli di un aggiornamento"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Salva la dimensione della finestra dell'update-manager"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Salva lo stato dell'espansione che contiene la lista dei cambiamenti e la "
+"descrizione"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Dimensione della finestra"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Aggiornamenti di Ubuntu 5.04"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 «Dapper Drake»"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Aggiornamenti di sicurezza per Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Aggiornamenti di Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Backport di Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD·con·Ubuntu·5.10·\"Breezy·Badger\""
+msgstr "Ubuntu 5.10 «Breezy Badger»"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Aggiornamenti di sicurezza di Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aggiornamenti di Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+msgstr "Backport di Ubuntu 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Supportato ufficialmente"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Copyright con restrizioni"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr "Manutenuto dalla comunità (Universe)"
+msgstr "Mantenuto dalla comunità (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Software non libero (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian·3.1·\"Sarge\""
+msgstr "Debian 3.1 «Sarge»"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Aggiornamenti di Sicurezza di Debian Stable"
+msgstr "Aggiornamenti di sicurezza di Debian 3.1 «Sarge»"
 
-#. Description
 #: ../channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian·Testing"
+msgstr "Debian «Etch» (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian·Non-US·(Unstable)"
+msgstr "Debian «Sid» (Unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Supportato ufficialmente"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Software compatibile con le DFSG e con dipendenze non libere"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Software non compatibile con le DFSG"
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Installazione degli aggiornamenti..."
-
-#, fuzzy
 #~ msgid "Reload the latest information about updates"
-#~ msgstr "Ricarica le informazioni del pacchetto dal server"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sezioni:</b>"
+#~ msgstr "Ricarica le informazioni sugli aggiornamenti"
 
 #, fuzzy
 #~ msgid "Add Software Channels"
@@ -924,8 +886,8 @@ msgstr ""
 #~ "\n"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Download delle modifiche in corso</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">Download delle modifiche in "
+#~ "corso</span>\n"
 #~ "\n"
 #~ "Devo scaricare le modifiche dal server centrale"
 
@@ -953,6 +915,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "giorni"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Componenti</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
 
@@ -974,11 +939,11 @@ msgstr ""
 #~ "permette di verificare l'integrità del software che scarichi."
 
 #~ 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. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "Aggiungi un nuovo file per una chiave nel portachiavi fidato. Assicurati "
-#~ "di aver ricevuto la chiave attraverso un canale sicuro e di fidarti del "
+#~ "Aggiungi un nuovo file per una chiave nel portachiavi fidato. Assicurati di "
+#~ "aver ricevuto la chiave attraverso un canale sicuro e di fidarti del "
 #~ "proprietario. "
 
 #~ msgid "Add repository..."
@@ -1006,8 +971,8 @@ msgstr ""
 #~ msgstr "Dimensione massima in MB:"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Ripristina le chiavi di default della distribuzione.\n"
 #~ "Questo non modificherà le chiavi installate dal'utente."
@@ -1039,13 +1004,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<bi><b>Aggiornamenti Disponibili</b></big>\n"
 #~ "\n"
-#~ "I seguenti pacchetti possono essere aggiornati. Puoi aggiornarli usando "
-#~ "il pulsante Installa."
+#~ "I seguenti pacchetti possono essere aggiornati. Puoi aggiornarli usando il "
+#~ "pulsante Installa."
 
 #~ msgid "Cancel downloading the changelog"
 #~ msgstr "Cancella il download delle modifiche"
@@ -1101,8 +1066,7 @@ msgstr ""
 
 #~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
 #~ msgstr ""
-#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu <cdimage@ubuntu."
-#~ "com>"
+#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu <cdimage@ubuntu.com>"
 
 #~ msgid "Choose a key-file"
 #~ msgstr "Scegli un file di chiave"
@@ -1119,24 +1083,33 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versione %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Download modifiche in corso..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "Non ci sono apacchetti aggiornati"
 
 #~ msgid "You did not select any of the %s updated package"
-#~ msgstr "Non hai selezionato nessuno dei %s pacchetti aggiornati"
+#~ msgid_plural "You did not select any of the %s updated packages"
+#~ msgstr[0] "Non hai selezionato nessuno dei %s pacchetti aggiornati"
+#~ msgstr[1] ""
 
 #~ msgid "You have selected %s updated package, size %s"
-#~ msgstr "Hai selezionato %s pacchetti aggiornati, dimensione %s"
+#~ msgid_plural "You have selected all %s updated packages, total size %s"
+#~ msgstr[0] "Hai selezionato %s pacchetti aggiornati, dimensione %s"
+#~ msgstr[1] ""
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgstr "Hai selezionato %s pacchetti su %s, dimensione %s"
+#~ msgid_plural "You have selected %s out of %s updated packages, total size %s"
+#~ msgstr[0] "Hai selezionato %s pacchetti su %s, dimensione %s"
+#~ msgstr[1] ""
 
 #~ msgid "The updates are being applied."
 #~ msgstr "Gli aggiornamenti sono in fase di applicazione."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Puoi eseguire una sola applicazione di gestione dei pacchetti "
 #~ "contemporaneamente. Per favore prima chiudi quest'altra applicazione."
@@ -1155,35 +1128,34 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Per favore aggiornati ad una nuova versione di Ubuntu Linux. La versione "
-#~ "che stai usando non riceverà più aggiornamenti di sicurezza o altri "
-#~ "aggiornamenti critici. Per favore guarda su http://www.ubuntulinux.org "
-#~ "per informazioni riguardo all'aggiornamento."
+#~ "Per favore aggiornati ad una nuova versione di Ubuntu Linux. La versione che "
+#~ "stai usando non riceverà più aggiornamenti di sicurezza o altri "
+#~ "aggiornamenti critici. Per favore guarda su http://www.ubuntulinux.org per "
+#~ "informazioni riguardo all'aggiornamento."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "È disponibile una nuova release di Ubuntu!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "Una nuova release con nome '%s' è disponbile. Per favore guarda su http://"
-#~ "www.ubuntulinux.org/ per informazioni sull'aggiornamento"
+#~ "Una nuova release con nome '%s' è disponbile. Per favore guarda su "
+#~ "http://www.ubuntulinux.org/ per informazioni sull'aggiornamento"
 
 #~ msgid "Never show this message again"
 #~ msgstr "Non mostrare più questo messaggio"
 
 #~ msgid "Changes not found, the server may not be updated yet."
 #~ msgstr ""
-#~ "Modifiche non trovate, il server potrebbe non essere stato ancora "
-#~ "aggiornato."
+#~ "Modifiche non trovate, il server potrebbe non essere stato ancora aggiornato."
 
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
 #~ "Impossibile scaricare le modifiche. Per favore controlla se c'è una "
-#~ "connessione internet attiva."
+#~ "connessione internet attiva."
\ No newline at end of file
diff --git a/po/ja.po b/po/ja.po
index 33d9c88a..5b2b2ae5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,13 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-10-12 17:28+0900\n"
-"Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:18+0000\n"
+"Last-Translator: ikuya <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\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:104
 #, python-format
@@ -27,28 +28,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "選択したファイルのインポートエラー"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr ""
-"選択したファイルはGPGキーファイルではないか、壊れている可能性があります。"
+msgstr "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "キー削除のエラー"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +57,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -82,7 +83,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -92,38 +92,36 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
+msgstr "選択したキーを削除できませんでした。バグとして報告してください。 "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
+msgstr "選択したキーを削除できませんでした。バグとして報告してください。 "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -136,7 +134,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -184,204 +181,180 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "他のパッケージマネージャが動いています"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "アップグレードが終了しました"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "変更点を取得中..."
+msgid "Installing updates"
+msgstr "アップデートをインストール中..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "システムに壊れたパッケージがあります！"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>詳細</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "インストール(_I)"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "アップグレードが終了しました"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -389,11 +362,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -413,8 +385,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -427,51 +399,38 @@ msgid "Details"
 msgstr "<b>詳細</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "再読込"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -504,56 +463,52 @@ msgid "Changes"
 msgstr "変更点"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "詳細"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "ソフトウェアのアップデート"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "アップデートをインストール中..."
@@ -627,7 +582,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -636,7 +591,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -658,14 +613,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>コメント:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>コンポーネント</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>ディストリビューション:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>セクション:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -682,17 +636,16 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>追加したい APT line のレポジトリを入力してください。</b></big>\n"
 "\n"
-"APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb http://"
-"ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式について書か"
-"れています。"
+"APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb http://ftp.debian.org sarge "
+"main\"</i>付属のドキュメントに詳細な記述形式について書かれています。"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -720,7 +673,8 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -768,143 +722,113 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "公式サポート"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "コミュニティによるメンテナンス (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "非フリー (Multiuniverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian Stable セキュリティアップデート"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "公式サポート"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "アップデートをインストール中..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "サーバからパッケージ情報を再度読み込む。"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>セクション:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "ソフトウェアのアップデート"
@@ -944,6 +868,9 @@ msgstr ""
 #~ msgid "Choose a key-file"
 #~ msgstr "キーファイルを選択"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>コンポーネント</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>リポジトリ</b>"
 
@@ -961,18 +888,15 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>認証鍵</b></big>\n"
 #~ "\n"
-#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完"
-#~ "全なものか確認することができます。"
+#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完全なものか確認することができます。"
 
 #~ msgid "A_uthentication"
 #~ msgstr "認証(_U)"
 
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経"
-#~ "由で鍵を取得し、信頼される持ち主のものか確認してください。"
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
+#~ msgstr "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経由で鍵を取得し、信頼される持ち主のものか確認してください。 "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "一時ファイルを自動的に削除する(_T)"
@@ -993,11 +917,9 @@ msgstr ""
 #~ msgstr "最大量(MB):"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更により"
-#~ "ユーザが追加した鍵が失われることはありません。"
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
+#~ msgstr "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更によりユーザが追加した鍵が失われることはありません。"
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "パッケージキャッシュの最大量を設定する(_M)"
@@ -1023,27 +945,26 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "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 ""
 #~ "Reload the package information from the server. \n"
 #~ "\n"
-#~ "If you have a permanent internet connection this is done automatically. "
-#~ "If you are behind an internet connection that needs to be started by hand "
-#~ "(e.g. a modem) you should use this button so that update-manager knows "
-#~ "about new updates."
+#~ "If you have a permanent internet connection this is done automatically. If "
+#~ "you are behind an internet connection that needs to be started by hand (e.g. "
+#~ "a modem) you should use this button so that update-manager knows about new "
+#~ "updates."
 #~ msgstr ""
 #~ "サーバからパッケージ情報を読み込み直します。\n"
 #~ "\n"
-#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデム"
-#~ "などでそうではないなら、アップデートマネージャに新しいアップデートがあるか"
-#~ "どうかを知らせるため、このボタンを使用して手動で行う必要があります。"
+#~ ""
+#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデムなどでそうではないなら、アップデートマネージャに新しいアップデートがあるかどうかを"
+#~ "知らせるため、このボタンを使用して手動で行う必要があります。"
 
 #~ msgid "Binary"
 #~ msgstr "バイナリ"
@@ -1076,14 +997,13 @@ msgstr ""
 #~ msgstr "リポジトリが変更されました"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコ"
-#~ "ピーしました\n"
+#~ "リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコピーしました\n"
 #~ "\n"
 #~ "パッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?"
 
@@ -1091,8 +1011,7 @@ msgstr ""
 #~ "This means that some dependencies of the installed packages are not "
 #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
 #~ msgstr ""
-#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" ま"
-#~ "たは \"apt-get\" を使用して修正してください。 "
+#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" または \"apt-get\" を使用して修正してください。"
 
 #~ msgid "It is not possible to upgrade all packages."
 #~ msgstr "全てのパッケージをアップグレードすることは不可能です。"
@@ -1100,40 +1019,35 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対"
-#~ "処がいるようです。Synaptic \"Smart Upgrade\"か\"apt-get dist-upgrade\"を実"
-#~ "行して問題を修正してください。"
+#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対処がいるようです。Synaptic \"Smart "
+#~ "Upgrade\"か\"apt-get dist-upgrade\"を実行して問題を修正してください。"
 
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "これらのパッケージはアップグレードされません:"
+#~ msgstr "これらのパッケージはアップグレードされません: "
 
 #~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "変更点は見つかりませんでした。サーバはまだアップデートされていないようで"
-#~ "す。"
+#~ msgstr "変更点は見つかりませんでした。サーバはまだアップデートされていないようです。"
 
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
-#~ msgstr ""
-#~ "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
-#~ "い。"
+#~ msgstr "変更点の取得に失敗しました。インターネットに接続されているか確認してください。"
 
 #~ msgid "Version %s: \n"
 #~ msgstr "バージョン %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "変更点を取得中..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "アップデートされました。"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケー"
-#~ "ションマネージャを終了してください。"
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
+#~ msgstr "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケーションマネージャを終了してください。"
 
 #~ msgid "Updating package list..."
 #~ msgstr "アップデートされるパッケージのリスト..."
@@ -1152,22 +1066,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "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/ を見てください。"
+#~ "新しいUbuntu "
+#~ "Linuxにアップグレードしてください。現在お使いのシステムにはセキュリティフィクスや危急のアップデートはすでに提供されていません。アッ"
+#~ "プグレードに関する情報は http://www.ubuntulinux.org/ を見てください。"
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Ubuntuの新しいリリース版があります！"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするため"
-#~ "に http://www.ubuntulinux.org/ をご覧ください。"
+#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするために http://www.ubuntulinux.org/ "
+#~ "をご覧ください。"
 
 #~ msgid "Never show this message again"
 #~ msgstr "このメッセージを二度と表示しない"
@@ -1176,11 +1090,10 @@ msgstr ""
 #~ msgstr "排他的なロックができません"
 
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や "
-#~ "aptitudeのような他のパッケージマネージャを終了してください。"
+#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や aptitudeのような他のパッケージマネージャを終了してください。"
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "アップデートリストを取得中..."
@@ -1200,10 +1113,9 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>利用可能なアップデート</b></big>\n"
 #~ "\n"
-#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれら"
-#~ "のパッケージがインストールされます。"
+#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれらのパッケージがインストールされます。"
\ No newline at end of file
diff --git a/po/lt.po b/po/lt.po
index 73454cec..4ad513c3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,66 +7,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-09-15 15:06+0300\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-20 21:56+0000\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Kas %s dienas"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Po %s dienų"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Importuoti raktą"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
-msgstr "Importuojant pasirinktą bylą įvyko klaida"
+msgstr "Importuojant pasirinktą rinkmeną įvyko klaida"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Pasirinkta byla gali būti ne GPG rakto byla arba sugadinta byla."
+msgstr ""
+"Pasirinkta rinkmena gali būti ne GPG rakto rinkmena arba sugadinta rinkmena."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Šalinant raktą įvyko klaida"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Klaida skanuojant CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Įveskite disko pavadinimą"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Įdėkite diską į įrenginį:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Sugadinti paketai"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
@@ -76,56 +81,50 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Negalima atnaujinti reikiamų metapaketų"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Nepavyko paskaičiuoti atnaujinimo"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Klaida autentikuojant keletą paketų"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Negalima įdiegti „%s“"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
+"Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -138,10 +137,9 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Nerasta tinkamo įrašo"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
@@ -151,7 +149,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Saugyklų informacija netinkama"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
@@ -160,9 +158,8 @@ msgid ""
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Šalinant raktą įvyko klaida"
+msgstr "Klaida atnaujinant"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
@@ -172,7 +169,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Diske nepakanka laisvos vietos"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -184,221 +181,199 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "At norite pradėti atnaujinimą?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Nepavyko įdiegti atnaujinimų"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Nepavyko atsiųsti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Pašalinti pasenusius paketus?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Šiuo metu jau veikia kita paketų tvarkyklė"
+msgstr "Tikrinama paketų valdyklė"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Atnaujinama saugyklų informacija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Klausiama patvirtinimo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Atnaujinimas baigtas"
+msgstr "Atnaujinama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Ieškoma pasenusios programinės įrangos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Sistemos atnaujinimas baigtas."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Atsiųsta"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "liko %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Parsiunčiami pakeitimai..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Diegiami atnaujinimai"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Nepavyko įdiegti „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-"Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "Atnaujinimas nutrūko. Praneškite apie tai kaip apie klaidą."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Įvyko lemtinga klaida"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Bus pašalintas %s paketas."
+msgstr[1] "Bus pašalinti %s paketai."
+msgstr[2] "Bus pašalinta %s paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Bus įdiegtas %s naujas paketas."
+msgstr[1] "Bus įdiegti %s nauji paketai."
+msgstr[2] "Bus įdiegta %s naujų paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Bus atnaujintas %s paketas."
+msgstr[1] "Bus atnaujinti %s paketai."
+msgstr[2] "Bus atnaujinta %s paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Turite atsisiųsti viso %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir "
+"dokumentus."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Nepavyko rasti jokių atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "Jūsų sistema jau buvo atnaujinta."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Raktai</b>"
+msgstr "<b>Pašalinti %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "Į_diegti"
+msgstr "Įdiegti %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Atnaujinimas baigtas"
+msgstr "Atnaujinti %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Reikia perkrauti kompiuterį"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Atnaujinimas baigtas ir reikia perkrauti kompiuteri. Ar norite tai atlikti "
+"dabar?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -414,71 +389,59 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Pradėti atnaujinimą?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu „Dapper“ "
+"6.04</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Išvaloma"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Detalės</b>"
+msgstr "Detalės"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Atsiunčiami ir įdiegiami atnaujinimai"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Keičiami programinės įrangos kanalai"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Ruošiamas atnaujinimas"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Perkraunama sistema"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminalas"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Atnaujinti"
+msgstr "Atnaujinama Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Pranešti apie klaidą"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Perkrauti dabar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Tęsti atnaujinimą"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -495,6 +458,10 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Ieškoma galimų atnaujinimų</b></big>\n"
+"\n"
+"Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo "
+"spragas bei suteikti naujas funkcijas."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
@@ -502,75 +469,69 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Atšaukti _atsiuntimą"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Pakeitimai"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
+msgid "Check for available updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-#, fuzzy
-msgid "Check for available updates"
-msgstr "Ieškoma atnaujinimų..."
-
-#: ../data/UpdateManager.glade.h:12
 msgid "Description"
 msgstr "Aprašymas"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Leidimo aprašymas"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Rodyti detales"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Rodyti pavienių rinkmenų progresą"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Programinės įrangos atnaujinimai"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo "
+"spragas bei suteikti naujas funkcijas."
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr ""
+msgstr "At_naujinti"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Atnaujinti iki naujausios Ubuntu versijos"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Nerodyti šios informacijos ateityje"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "Diegiami atnaujinimai..."
+msgstr "Į_diegti atnaujinimus"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Raktai</b>"
+msgstr "<b>Kanalai</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internetiniai atnaujinimai</b>"
 
@@ -580,7 +541,7 @@ msgstr "<b>Raktai</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "Pridėti _CD"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -588,21 +549,19 @@ msgstr "Autentikacija"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Iš_trinti atsiųstas programinės įrangos rinkmenas:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Pašalinti pasirinktą raktą iš patikimo raktų žiedo."
+msgstr "Importuoti viešą raktą iš patikimo programinės įrangos tiekėjo"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr "Diegimo laikmenos"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Internetiniai atnaujinimai</b>"
+msgstr "Internetiniai atnaujinimai"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -612,35 +571,32 @@ msgid ""
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Atkurti numatytuosius"
+msgstr "Atkurti _numatytuosius"
 
 #: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "Atkurti numatytuosius raktus"
+msgstr "Atkurti _numatytuosius Jūsų distributyvui raktus"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
 msgstr "Programinės įrangos nustatymai"
 
 #: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "Tikrinti atnaujinimus kas"
+msgstr "_Ieškoti atnaujinimų automatiškai:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Atsiųsti atnaujinimus fone, tačiau jų neįdiegti"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -653,27 +609,24 @@ msgid ""
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Raktai</b>"
+msgstr "<b>Kanalas</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Komentaras:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Komponentai</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribucija:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Skyriai:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Skyriai:</b>"
+msgstr "<b>Skyriai</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -684,19 +637,17 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Įveskite visą Jūsų norimos pridėti saugyklos APT eilutę</b></big>\n"
+"<big><b>Įveskite visą Jūsų norimo pridėti kanalo APT eilutę</b></big>\n"
 "\n"
-"APT eilutė nurodo saugyklos tipą, vietą bei turinį, pvz., <i>„deb http://ftp."
-"debian.org sarge main“</i>. Išsamesnį sintaksės aprašymą galite rasti "
-"dokumentacijoje."
+"APT eilutė nurodo saugyklos tipą, vietą bei kanalo skyrius, pvz., <i>„deb "
+"http://ftp.debian.org sarge main“</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -704,7 +655,7 @@ msgstr "APT eilutė:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Pridėti kanalą"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -716,32 +667,34 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Keisti kanalą"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Skanuojamas CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Pridėti kanalą"
+msgstr[1] "_Pridėti kanalus"
+msgstr[2] "_Pridėti kanalų"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Kita"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Atnaujinti"
+msgstr "Į_kelti iš naujo"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Rodyti ir įdiegti galimus atnaujinimus"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Atnaujinimų tvarkyklė"
+msgstr "Atnaujinimų valdyklė"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -752,15 +705,15 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Priminti įkelti iš naujo kanalų sąrašą"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Rodyti atnaujinimo detales"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Išsaugo update-manager dialogų dydį"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
@@ -770,436 +723,116 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Lango dydis"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 atnaujinimai"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 „Dapper Drake“"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 saugumo atnaujinimai"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 saugumo atnaujinimai"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.10 atnaujinimai"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 atnaujinimai"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.10 atnaujinimai"
+msgid "Ubuntu 6.04 Backports"
+msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD su Ubuntu 5.10 „Breezy Badger“"
+msgstr "Ubuntu 5.10 „Breezy Badger“"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 atnaujinimai"
+msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
-msgstr "Prižiūrima oficialiai"
+msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Apribotos autorinės teisės"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 „Sarge“"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable saugumo atnaujinimai"
+msgstr "Debian 3.1 „Sarge“ saugumo atnaujinimai"
 
-#. Description
 #: ../channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian Testing"
+msgstr "Debian „Etch“ (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.lt.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (Unstable)"
+msgstr "Debian „Sid“ (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Prižiūrima oficialiai"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
+"Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Diegiami atnaujinimai..."
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Atnaujinti serverio paketų informaciją."
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Skyriai:</b>"
-
-#, fuzzy
-#~ msgid "Add Software Channels"
-#~ msgstr "Programinės įrangos atnaujinimai"
+msgstr "Su DFSG nesuderinama programinė įranga"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "<b><big>You need to manually reload the latest information about "
+#~ "updates</big></b>\n"
 #~ "\n"
-#~ "Need to get the changes from the central server"
+#~ "Your system does not check for updates automatically. You can configure this "
+#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Parsiunčiami pakeitimai</span>\n"
-#~ "\n"
-#~ "Reikia gauti pakeitimus iš centrinio serverio"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Rodyti galimus atnaujimus ir pasirinkti įdiegtinus"
-
-#, fuzzy
-#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-#~ msgstr "CD su Ubuntu 5.04 „Hoary Hedgehog“"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Šalinant raktą įvyko klaida"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Keisti programinės įrangos šaltinius ir nustatymus"
-
-#~ msgid "Software Properties"
-#~ msgstr "Programinės įrangos savybės"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Šaltiniai</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "dieną(as)"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Saugykla</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Laikinos bylos</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Naudotojo sąsaja</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
+#~ "<b><big>Jūs turite patys įkelti naujausią informaciją apie "
+#~ "atnaujinimus</big></b>\n"
 #~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Autentikacijos raktai</b></big>\n"
-#~ "\n"
-#~ "Šiame dialoge Jūs galite pridėti ir pašalinti autentikacijos raktus. "
-#~ "Rakto pagalba galima patikrinti Jūsų parsiunčiamos programinės įrangos "
-#~ "integruotumą."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Įdėkite naują raktų bylą į patikimą raktų rinkinį. Įsitikinkite, kad Jūs "
-#~ "gavote raktą saugiu kanalu bei, kad Jūs pažįstate savininkas."
-
-#~ msgid "Add repository..."
-#~ msgstr "Pridėti saugyklą..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Automatiškai patikrinti ar yra _atnaujinimų."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Automatiškai išvalyti _laikinas paketų bylas"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Išvalymo intervalas dienomis:"
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Ištrinti _senus paketus iš paketų sandėlio"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Keisti saugyklą..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maksimalus amžius dienomis:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maksimalus dydis megabaitais:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Atkurti numatytuosius raktus atkeliavusius su distribucija. Tai nepakeis "
-#~ "naudotojo įdiegtų raktų."
+#~ "Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite "
+#~ "konfigūruoti „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“."
 
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Nustatyti _maksimalų paketų sandėlio dydį"
-
-#~ msgid "Settings"
-#~ msgstr "Nustatymai"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Rodyti išsamias paketų versijas"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Rodyti atjungtus programinės įrangos šaltinius"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Atnaujinimų intervalas dienomis: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Pridėti saugyklą"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Parsiųsti atnaujintus paketus"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Būsena:</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>Prieinami atnaujinimai</b></big>\n"
-#~ "\n"
-#~ "Sekantys paketai gali būti atnaujinti. Juos atnaujinti galite paspausdami "
-#~ "mygtuką Įdiegti."
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Atšaukti pakeitimų žurnalo parsiuntimą"
-
-#~ msgid "Downloading Changes"
-#~ msgstr "Parsiunčiami pakeitimai"
-
-#, fuzzy
-#~ msgid "Debian sarge"
-#~ msgstr "Debian 3.1 „Sarge“"
-
-#, fuzzy
-#~ msgid "Debian etch"
-#~ msgstr "Debian Testing"
-
-#, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "Debian Testing"
-
-#, fuzzy
-#~ msgid "Oficial Distribution"
-#~ msgstr "<b>Distribucija:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Jums reikia būti root, norint paleisti šią programą"
-
-#~ msgid "Binary"
-#~ msgstr "Dvejetainiai"
-
-#~ msgid "Source"
-#~ msgstr "Pradiniai tekstai"
-
-#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\""
-#~ msgstr "CD su Ubuntu 4.10 „Warthy Warthog“"
-
-#~ msgid "Ubuntu 4.10 Security Updates"
-#~ msgstr "Ubuntu 4.10 saugumo atnaujinimai"
-
-#~ msgid "Ubuntu 4.10 Updates"
-#~ msgstr "Ubuntu 4.10 atnaujinimai"
-
-#~ msgid "Contributed software"
-#~ msgstr "Paaukota programinė įranga"
-
-#~ msgid "Non-free software"
-#~ msgstr "Ne Laisva programinė įranga"
-
-#~ msgid "US export restricted software"
-#~ msgstr "Draudžiama eksportuoti iš JAV programinė įranga"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 „Woody“"
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Unstable \"Sid\""
-#~ msgstr "Debian Unstable „Sid“"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu archyvo automatinio pasirašymo raktas <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr ""
-#~ "Ubuntu CD atvaizdžių automatinio pasirašymo raktas <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Pasirinkite rakto bylą"
-
-#~ msgid "Your system is up-to-date!"
-#~ msgstr "Jūsų sistema yra atnaujinta!"
-
-#~ msgid "There is one package available for updating."
-#~ msgstr "Yra vienas atnaujintinas paketas."
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Yra %s atnaujintini paketai."
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versija %s: \n"
-
-#~ msgid "There are no updated packages"
-#~ msgstr "Nėra atnaujintų paketų"
-
-#~ 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] "Nepasirinkote nei vieno iš %s atnaujinto paketo"
-#~ msgstr[1] "Nepasirinkote nei vieno iš %s atnaujintų paketų"
-#~ msgstr[2] "Nepasirinkote nei vieno iš %s atnaujintų paketų"
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Jūs pasirinkote %s atnaujintą paketą, dydis %s"
-#~ msgstr[1] "Jūs pasirinkote %s atnaujintus paketus, visas dydis %s"
-#~ msgstr[2] "Jūs pasirinkote %s atnaujintų paketų, visas dydis %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Jūs pasirinkote %s iš %s atnaujinto paketo, dydis %s"
-#~ msgstr[1] "Jūs pasirinkote %s iš %s atnaujintų paketų, visas dydis %s"
-#~ msgstr[2] "Jūs pasirinkote %s iš %s atnaujintų paketų, visas dydis %s"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Pritaikomi atnaujinimai."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Tuo pačiu metu Jūs galite paleisti tik vieną paketų tvarkyklę. Pirma "
-#~ "uždarykite tą kitą programą."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Atnaujinamas paketų sąrašas..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "Nėra atnaujinimų."
-
-#~ msgid "New version:"
-#~ msgstr "Nauja versija:"
-
-#~ msgid "Your distribution is no longer supported"
-#~ msgstr "Jūsų distribucija daugiau nepalaikoma"
-
-#~ 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 ""
-#~ "Atnaujinkite Ubuntu Linux iki naujesnės versijos. Jūsų naudojamai "
-#~ "versijai nebebus teikiami saugumo pataisymai bei kiti kritiniai "
-#~ "atnaujinimai. Informaciją apie atnaujinimą galite rasti http://www."
-#~ "ubuntulinux.org."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Yra išleistas naujas Ubuntu leidimas!"
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Prieinamas naujas leidimas kodiniu pavadinimu „%s“. Atnaujinimo "
-#~ "instrukcijas galite rasti http://www.ubuntulinux.org."
-
-#~ msgid "Never show this message again"
-#~ msgstr "Daugiau nerodyti šios žinutės"
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Pakeitimai nerasti, serveris gali būti dar neatnaujintas."
-
-#~ msgid ""
-#~ "Failed to download changes. Please check if there is an active internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Nepavyko parsiųsti pakeitimų. Patikrinkite ar esate prisijungę prie "
-#~ "Interneto."
+#~ msgid "Reload the latest information about updates"
+#~ msgstr "Įkelti naujausią informaciją apie atnaujinimus"
\ No newline at end of file
diff --git a/po/mk.po b/po/mk.po
index 9db35515..9ea1d70c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
-"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-07-20 01:21+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:18+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
@@ -27,30 +27,31 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Грешка при увоз на избраната датотека"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Избраната датотека може да не е GPG датотека или пак може да е расипана."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Грешка при отстранување на клучот"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -58,11 +59,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -84,7 +85,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -96,40 +96,38 @@ msgid ""
 "this as a bug. "
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
-"како бубачка."
+"како бубачка. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
-"како бубачка."
+"како бубачка. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -142,7 +140,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -190,142 +187,122 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Веќе работи друг менаџер за пакети"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Надградбата е завршена"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Преземам промени..."
+msgid "Installing updates"
+msgstr "Инсталирам надградби..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -333,7 +310,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -341,7 +318,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -349,49 +326,48 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Копчиња</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Инсталирај"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Надградбата е завршена"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -399,11 +375,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -423,8 +398,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -437,51 +412,38 @@ msgid "Details"
 msgstr "<b>Детали</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Освежи"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -514,57 +476,53 @@ msgid "Changes"
 msgstr "Промени"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "Проверувам за надградби..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Опис"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Надградба на софтвер"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Инсталирам надградби..."
@@ -636,7 +594,7 @@ msgid "_Check for updates automatically:"
 msgstr "Проверувај за надградби на секои"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -645,7 +603,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -667,14 +625,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Компоненти</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Дистрибуција:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Оддели:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -691,14 +648,14 @@ msgstr "<b>Адреса:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Внесете ја комплетната линија за APT складиштето за да го додадете</"
-"b></big>\n"
+"<big><b>Внесете ја комплетната линија за APT складиштето за да го "
+"додадете</b></big>\n"
 "\n"
 "APT линијата го содржи типот, локацијата и содржината на складиштето за на "
 "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата "
@@ -730,7 +687,10 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -778,181 +738,134 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Надградби за Убунту 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Надградби за Убунту 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Надградби за Убунту 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Надградби за Убунту 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Официјално поддржано"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Безбедносни надградби за Debian Stable"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian Testing"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Официјално поддржано"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Инсталирам надградби..."
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Освежи ги информациите за пакетите на серверот."
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Оддели:</b>"
-
-#, fuzzy
-#~ msgid "Add Software Channels"
-#~ msgstr "Надградба на софтвер"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ги преземам промените</span>\n"
-#~ "\n"
-#~ "Треба да ги преземам промените од централниот сервер."
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Покажи достапни надградби и избери кои да бидат инсталирани"
-
-#, fuzzy
-#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-#~ msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Грешка при отстранување на клучот"
-
 #~ msgid "Edit software sources and settings"
 #~ msgstr "Уреди софтверски извори и поставувања"
 
 #~ msgid "Software Properties"
 #~ msgstr "Софтверски својства"
 
+#~ msgid "<b>Internet Updates</b>"
+#~ msgstr "<b>Надградби од интернет</b>"
+
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Извори</b>"
 
+#~ msgid "Check for updates every"
+#~ msgstr "Проверувај за надградби на секои"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Врати стандардно"
+
 #~ msgid "day(s)"
 #~ msgstr "ден(а)"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Компоненти</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Складиште</b>"
 
@@ -975,12 +888,27 @@ msgstr ""
 #~ "што го преземате."
 
 #~ 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. "
+#~ "<big><b>Enter the complete APT line of the repository that you want to "
+#~ "add</b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and content of a repository, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+#~ "detailed description of the syntax in the documentation."
+#~ msgstr ""
+#~ "<big><b>Внесете ја комплетната линија за APT складиштето за да го "
+#~ "додадете</b></big>\n"
+#~ "\n"
+#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за на "
+#~ "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата "
+#~ "можете да најдете детален опис на синтаксата."
+
+#~ msgid ""
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Додајте нова датотека со клуч во доверливиот привезок. Осигурајте се дека "
 #~ "сте го добиле клучот преку безбеден канал и дека му верувате на неговиот "
-#~ "сопственик."
+#~ "сопственик. "
 
 #~ msgid "Add repository..."
 #~ msgstr "Додај складиште..."
@@ -992,7 +920,7 @@ msgstr ""
 #~ msgstr "Автоматски чисти ги _привремените пакети"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "Интервал за чистење во денови:"
+#~ msgstr "Интервал за чистење во денови: "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "Избриши _стари пакети од кешот за пакети"
@@ -1006,9 +934,15 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Максимална големина во MB:"
 
+#~ msgid "Remove the selected key from the trusted keyring."
+#~ msgstr "Отстрани го избраниот клуч од доверливиот привезок."
+
+#~ msgid "Restore default keys"
+#~ msgstr "Врати ги стандардните клучеви"
+
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Врати ги стандардните клучеви на дистрибуцијата. Ова нема да ги смени "
 #~ "клучевите инсталирани од корисникот."
@@ -1034,35 +968,71 @@ msgstr ""
 #~ msgid "_Download upgradable packages"
 #~ msgstr "_Преземи ги надградливите пакети"
 
+#~ msgid "<b>Details</b>"
+#~ msgstr "<b>Детали</b>"
+
 #~ msgid "<b>Status:</b>"
 #~ msgstr "<b>Статус:</b>"
 
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Достапни надградби</b></big>\n"
 #~ "\n"
 #~ "Следниве пакети се надградливи. Можете да ги надградите со кликнување на "
 #~ "копчето „Инсталирај“."
 
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ги преземам промените</span>\n"
+#~ "\n"
+#~ "Треба да ги преземам промените од централниот сервер."
+
 #~ msgid "Cancel downloading the changelog"
 #~ msgstr "Откажи го преземањето на логот со промени"
 
 #~ msgid "Downloading Changes"
 #~ msgstr "Преземам промени"
 
+#~ msgid "Reload"
+#~ msgstr "Освежи"
+
+#~ msgid "Reload the package information from the server."
+#~ msgstr "Освежи ги информациите за пакетите на серверот."
+
+#~ msgid "_Install"
+#~ msgstr "_Инсталирај"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Покажи достапни надградби и избери кои да бидат инсталирани"
+
 #~ msgid "You need to be root to run this program"
 #~ msgstr "Треба да сте root за да ја извршите оваа програма"
 
+#~ msgid "Ubuntu 5.04 Security Updates"
+#~ msgstr "Безбедносни надградби за Убунту 5.04"
+
+#~ msgid "Ubuntu 5.04 Updates"
+#~ msgstr "Надградби за Убунту 5.04"
+
 #~ msgid "Binary"
 #~ msgstr "Бинарни"
 
 #~ msgid "Source"
 #~ msgstr "Изворен код"
 
+#~ msgid "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+#~ msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
+
+#~ msgid "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+
 #~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\""
 #~ msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
@@ -1084,9 +1054,15 @@ msgstr ""
 #~ msgid "Debian 3.0 \"Woody\""
 #~ msgstr "Debian 3.0 \"Woody\""
 
+#~ msgid "Debian Stable Security Updates"
+#~ msgstr "Безбедносни надградби за Debian Stable"
+
 #~ msgid "Debian Stable"
 #~ msgstr "Debian Stable"
 
+#~ msgid "Debian Testing"
+#~ msgstr "Debian Testing"
+
 #~ msgid "Debian Unstable \"Sid\""
 #~ msgstr "Debian Unstable \"Sid\""
 
@@ -1096,6 +1072,9 @@ msgstr ""
 #~ msgid "Debian Non-US (Testing)"
 #~ msgstr "Debian Non-US (Testing)"
 
+#~ msgid "Debian Non-US (Unstable)"
+#~ msgstr "Debian Non-US (Unstable)"
+
 #~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
 #~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
 
@@ -1117,6 +1096,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Верзија %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Преземам промени..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "Нема надградени пакети"
 
@@ -1133,8 +1115,7 @@ msgstr ""
 #~ msgstr[2] "Избравте %s пакети за надградба, со големина од %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ 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"
@@ -1142,16 +1123,28 @@ msgstr ""
 #~ msgid "The updates are being applied."
 #~ msgstr "Наградбите се применуваат."
 
+#~ msgid "Upgrade finished"
+#~ msgstr "Надградбата е завршена"
+
+#~ msgid "Another package manager is running"
+#~ msgstr "Веќе работи друг менаџер за пакети"
+
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Можете да работите само со една апликација за менаџмент на пакети "
-#~ "одеднаш. Ве молам прво исклучете ја оваа апликацијата."
+#~ "Можете да работите само со една апликација за менаџмент на пакети одеднаш. "
+#~ "Ве молам прво исклучете ја оваа апликацијата."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Ја ажурирам листата на пакети..."
 
+#~ msgid "Checking for updates..."
+#~ msgstr "Проверувам за надградби..."
+
+#~ msgid "Installing updates..."
+#~ msgstr "Инсталирам надградби..."
+
 #~ msgid "There are no updates available."
 #~ msgstr "Нема достапни надградби."
 
@@ -1163,20 +1156,20 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Ве молам надградете до понова верзија на Убунту Линукс. Верзијата на која "
-#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни "
-#~ "поправки и други технички надградби. Ве молам побарајте информации за "
-#~ "надградба на http://www.ubuntulinux.org."
+#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни поправки "
+#~ "и други технички надградби. Ве молам побарајте информации за надградба на "
+#~ "http://www.ubuntulinux.org."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Достапна е нова верзија на Убунту!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
 #~ "Постои ново издание објавено под кодното име '%s'. Ве молам побарајте ги "
 #~ "инструкциите за надградба на http://www.ubuntulinux.org."
@@ -1191,5 +1184,5 @@ msgstr ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
-#~ "Не успеав да ги преземам промените. Ве молам проверете дали Вашата "
-#~ "интернет врска е активна."
+#~ "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
+#~ "врска е активна."
\ No newline at end of file
diff --git a/po/nb.po b/po/nb.po
index f866b068..0100f0bc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-06-08 23:10+0200\n"
-"Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-26 14:48+0000\n"
+"Last-Translator: Ingar Saltvik <ingar@saltvik.org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,112 +20,119 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Hver %s dag"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Etter %s dager"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Importer nøkkel"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Feil under importering av fil"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet."
+msgstr "Den valgte filen er ikke en GPG-fil, ellers er den skadet."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Feil under fjerning av nøkkel"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Feil under lesing av CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Vennligst skriv inn et navn for platen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Vennligst sett inn planen i stasjonen:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Ødelagte pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"Ditt system inneholder ødelagte pakker som ikke kunne fikses i dette "
+"programmet. Vennligst fiks dem først ved å bruke synaptic eller apt-get før "
+"du fortsetter."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Kan ikke oppgradere nødvendige meta-pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "En nødvendig pakke må bli fjernet"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Kunne ikke forberede oppgraderingen"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
+"Et uopprettelig problem oppstå ved forberedelse av oppgraderingen. Vennligst "
+"rapporter dette som en feil. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Feil ved autentisering av noen pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Noen pakker kunne ikke autentiseres. Dette kan være et midlertidig "
+"nettverksproblem, og du bør prøve igjen senere. Se under for en liste over "
+"ikke-autentiserte pakker."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Kan ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
+"Det var ikke mulig å installere en nødvendig pakke. Vennligst rapporter "
+"denne feilen. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Kan ikke gjette på meta-pakke"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -133,46 +140,56 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Ditt system inneholder ikke en ubuntu-desktop, kubuntu-desktop eller "
+"edubuntu-desktop pakke, og det var ikke mulig å finne ut hvilken ubuntu-"
+"versjon du bruker.\n"
+"Vennligst installer én av de overstående pakkene først ved å bruke synaptic "
+"eller ap-get før du fortsetter."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Leser mellomlager"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Fant ikke noen gyldig oppføring"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Fant ikke noen gyldig oppføring for oppgradering ved lesing av "
+"arkivinformasjon.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Ugyldig informasjon om arkiv"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Oppgradering av arkivinformasjon resulterte i en ugyldig fil. Vennligst "
+"rapporter dette som en feil."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Feil under fjerning av nøkkel"
+msgstr "Feil under oppdatering"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Det oppstod et problem under oppdateringen. Dette skyldes vanligvis et "
+"problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din "
+"og prøv igjen."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Ikke nok ledig diskplass"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -181,223 +198,210 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Oppdateringen avbrytes nå. Vennlig frigjør minst %s diskplass. Tøm "
+"papirkurven og fjern midlertidige pakker fra tidligere installasjoner ved å "
+"bruke 'sudo apt-get-clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Ønsker du å starte oppgraderingen?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Kunne ikke installere oppgraderingene"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. Vennlist prøv "
+"'sudo apt-get install -f' eller Synaptic for å fikse systemet ditt."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Kunne ikke laste ned alle oppgraderingene."
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Oppgraderingen avbrytes nå. Vennligst sjekk internet tilkoblingen eller "
+"installasjonsmediet og prøv på nytt. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Ønsker du å fjerne utdaterte pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Feil ved commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Et problem oppstod under opprydningen. Vennligst se meldingen under for mer "
+"informasjon. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "En annen pakkehåndterer kjører"
+msgstr "Sjekker pakkehåndterer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Oppdaterer informasjon om arkivet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr "Undersøker systemkonfigurasjon"
+msgstr "Spør om bekreftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Oppgradering fullført"
+msgstr "Oppgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Søker etter utdatert programvare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Systemoppgraderingen er fullført"
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Vennligst sett inn '%s' i stasjonen '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Nedlastingen er fullført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Laster ned fil %li av %li med %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s gjenstår"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Laster ned fil %li av %li med ukjent hastighet"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Laster ned endringer..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Installerer oppdateringer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Kunne ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "Oppgraderingen avbrytes nå. Vennligst rapporter dette som en feil."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "En uopprettelig feil oppsto"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Vennligst rapporter feilen og inkluder filene ~/dist-upgrade.log og ~/dist-"
+"upgrade-apt.log i din melding. Oppgraderingen avbrytes nå. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pakke vil bli fjernet."
+msgstr[1] "%s pakker vil bli fjernet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pakke vil bli installert."
+msgstr[1] "%s pakker vil bli installert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pakke vil bli oppgradert."
+msgstr[1] "%s pakker vil bli oppgradert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Du må laste ned totalt %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere "
+"tidspunkt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Kunne ikke finne noen oppgraderinger"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Systemet har ødelagte pakker!"
+msgstr "Systemet ditt er allerede oppgradert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Detaljer</b>"
+msgstr "<b>Fjern %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Installer"
+msgstr "Installèr %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Oppgradering fullført"
+msgstr "Oppgradèr %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Omstart er nødvendig"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Oppgraderingen er fullført og en omstart av systemet er nødvendig. Vil du "
+"gjøre dette nå?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -406,78 +410,71 @@ 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>Vil du avbryte oppgraderingen?</big></b>\n"
+"\n"
+"Systemet kan bli ubrukelig hvis du avbryter oppgraderingen. Det anbefales på "
+"det sterkeste å fortsette med oppgraderingen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Gjør en omstart av systemet for å fullføre oppgraderingen</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Vil du starte oppgraderingen?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Oppgraderer til  Ubuntu \"Dapper\" "
+"6.04</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Rydder opp"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Detaljer</b>"
+msgstr "Detaljer"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Laster ned og installerer oppgraderingene"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Endrer kanalene for programvare"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Forbereder oppgraderingen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Starter systemet på nytt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
+msgstr "Oppgraderer Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Oppdater"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Rapportèr en feil"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Omstart nå"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Gjenoppta oppgradering"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -486,6 +483,11 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Du må sjekke for oppdateringer manuelt</big></b>\n"
+"\n"
+"Systemet ditt sjekker ikke for oppdateringer automatisk. Du kan sette opp "
+"denne oppførselen under \"System\" -> \"Administrasjon\" -> "
+"\"Programvareegenskaper\""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -494,93 +496,90 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Sjekker for tilgjengelige oppdateringer</b></big>\n"
+"\n"
+"Programvareoppdateringer kan fikse feil, eliminere sikkerhetsproblemer og gi "
+"deg ny funksjonalitet."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Hold systemet ditt oppdatert</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Avbryt ne_dlasting"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Endringer"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Sjekker for tilgjengelige oppdateringer"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Utgivelsesinformasjon"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Vis detaljer"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Vis framgang for enkeltfiler"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Programvareoppdateringer"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Programvareoppdateringer kan fikse feil, fjerne sikkerhetshull og tilby ny "
+"funksjonalitet."
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr ""
+msgstr "O_ppgrader"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Oppgrader til siste versjon av Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "Sjekk"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "Skjul denne informasjonen i fremtiden"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "Installerer oppdateringer..."
+msgstr "_Installerer oppdateringer"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Detaljer</b>"
+msgstr "<b>Kanaler</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Oppdateringer fra Internett</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
+msgstr "<b>Taster</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
-msgstr "Legg til _CD"
+msgstr "Legg til _cdrom"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -588,22 +587,19 @@ msgstr "Autentisering"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Sl_ett nedlastede filer:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
+msgstr "Importer den offentlige nøkkelen fra en tiltrodd programvareutgiver"
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Installerer oppdateringer..."
+msgstr "Installasjonsmedia"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Oppdateringer fra Internett</b>"
+msgstr "Oppdateringer fra Internett"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -611,37 +607,37 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Kun sikkerhetsoppdateringer fra de offisielle Ubuntu-tjenerne vil bli "
+"installert automatisk. Programvarepakken \"unattended-upgrades\" må derfor "
+"installeres."
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Gjenopprettt forvalgte nøkler"
+msgstr "Gjenopprett stan_dardverdier"
 
 #: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "Gjenopprettt forvalgte nøkler"
+msgstr "Gjenopprett standardnøkler for din distribusjon"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
 msgstr "Brukervalg for programvare"
 
 #: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "Installerer oppdateringer..."
+msgstr "_Sjekk for oppdateringer automatisk:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Last ned oppdateringer i bakgrunnen, men ikke installer dem"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -652,29 +648,32 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Kanalinformasjonen er utdatert</big></b>\n"
+"\n"
+"Du må laste kanalinformasjonen på nytt for å installere programvare og "
+"oppdateringer for nye og endrede kanaler. \n"
+"\n"
+"Du trenger en fungerende Internettilkobling for å kunne fortsette."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Detaljer</b>"
+msgstr "<b>Kanal</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Komponenter</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribusjon:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Seksjoner:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Seksjoner:</b>"
+msgstr "<b>Seksjoner</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -685,17 +684,16 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </big>\n"
+"<big><b>Skriv inn hele APT-linjen for kanalen du vil legge til</b> </big>\n"
 "\n"
-"APT-linjen inneholder typen, adressen og innholdet til et arkiv, for "
+"APT-linjen inneholder typen, adressen og innholdet til en kanal, for "
 "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
 "detaljert beskrivelse av syntaksen i dokumentasjonen."
 
@@ -705,7 +703,7 @@ msgstr "APT-linje:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Legg til kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -717,28 +715,29 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Endre kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Søker gjennom CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "Legg til k_anal"
+msgstr[1] "Legg til k_analer"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Tilpasset"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Oppdater"
+msgstr "_Last på nytt"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Vis og installèr tilgjengelige oppdateringer"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -750,18 +749,21 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Hvis automatisk sjekk for oppdateringer er slått av, så må du laste "
+"kanallisten på nytt manuelt. Dette valget tillater å skjule påminnelsen som "
+"er vist her."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Minn på å laste kanallisten på nytt"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Vis detaljer for en oppdatering"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Lagrer størrelsen for update-manager dialogen"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
@@ -771,147 +773,106 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Vindusstørrelsen"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 Updates"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Sikkerhetsoppdateringer for Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.10 Updates"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 Oppdateringer"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.10 Updates"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 Backports"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Backports"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 «Sarge»"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable Security Updates"
+msgstr "Debian 3.1 \"Sarge\" sikkerhetsoppdateringer"
 
-#. Description
 #: ../channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian Testing"
+msgstr "Debian \"Etch\" (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (Unstable)"
+msgstr "Debian \"Sid\" (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Offisielt støttet"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Installerer oppdateringer..."
+msgstr "Ikke-DFSG-kompatibel programvare"
 
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Oppdater pakkeinformasjonen fra tjeneren."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seksjoner:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Programvareoppdateringer"
@@ -946,6 +907,9 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>Programvarekilder</b>"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Komponenter</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Arkiv</b>"
 
@@ -963,16 +927,16 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Autentiseringsnøkler</b></big>\n"
 #~ "\n"
-#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. "
-#~ "Nøkler gjør det mulig å kontrollere integriteten til programvare som blir "
-#~ "lastet ned. "
+#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. Nøkler "
+#~ "gjør det mulig å kontrollere integriteten til programvare som blir lastet "
+#~ "ned."
 
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Legg til en ny nøkkelfil til den sikre nøkkelringen. Vær sikker på at du "
-#~ "mottok nøkkelen over en sikker kanal og at du stoler på eieren."
+#~ "mottok nøkkelen over en sikker kanal og at du stoler på eieren. "
 
 #, fuzzy
 #~ msgid "Add repository..."
@@ -985,7 +949,7 @@ msgstr ""
 #~ msgstr "Fjern _midlertidige pakkefiler automatisk."
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "Intervaller for tømming i dager:"
+#~ msgstr "Intervaller for tømming i dager: "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "Slett _gamle pakker i pakkelageret."
@@ -1000,8 +964,8 @@ msgstr ""
 #~ msgstr "Maksimum størrelse i MB:"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr "Gjenoppret nøklene som kom med distri"
 
 #~ msgid "Set _maximum size for the package cache"
@@ -1017,7 +981,7 @@ msgstr ""
 #~ msgstr "Vis deaktiverte programvarekilder"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "Intervall for oppdatering i dager:"
+#~ msgstr "Intervall for oppdatering i dager: "
 
 #~ msgid "_Add Repository"
 #~ msgstr "_Legg til arkiv"
@@ -1031,13 +995,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Tilgjengelige oppdateringer</b></big>\n"
 #~ "\n"
-#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke "
-#~ "på «Installer»-knappen."
+#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke på "
+#~ "«Installer»-knappen."
 
 #~ msgid "Cancel downloading the changelog"
 #~ msgstr "Avbryt nedlasting av endringslogg"
@@ -1126,6 +1090,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versjon %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Laster ned endringer..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "Det er ingen utdaterte pakker"
 
@@ -1140,17 +1107,16 @@ msgstr ""
 #~ msgstr[1] "Du har valgt alle de %s oppdaterte pakkene, total størrelse %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Du har valgt %s av %s oppdaterte pakker, størrelse %s "
+#~ msgid_plural "You have selected %s out of %s updated packages, total size %s"
+#~ msgstr[0] "Du har valgt %s av %s oppdaterte pakker, størrelse %s"
 #~ msgstr[1] "Du har valgt %s av de %s oppdaterte pakkene, total størrelse %s"
 
 #~ msgid "The updates are being applied."
 #~ msgstr "Oppdateringene blir tilført."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Du kan bare kjøre et pakkehåndteringsprogram samtidig. Lukk det andre "
 #~ "programmet først."
@@ -1169,19 +1135,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får "
-#~ "ikke sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. "
-#~ "Se http://www.ubuntulinux.org for informasjon om oppgradering."
+#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får ikke "
+#~ "sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. Se "
+#~ "http://www.ubuntulinux.org for informasjon om oppgradering."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
 #~ "En ny versjon med kodenavnet «%s» er tilgjengelig. Se http://www. "
 #~ "ubuntulinux.org/ for instruksjoner om oppgradering."
@@ -1211,8 +1177,8 @@ msgstr ""
 #~ msgstr "Arkiv har blitt endret"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1236,12 +1202,11 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra "
-#~ "handling (som å installere eller fjerne pakker). Bruk «Synaptic» eller "
-#~ "«apt-get dist-upgrade» for å løse problemet."
+#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra handling "
+#~ "(som å installere eller fjerne pakker). Bruk «Synaptic» eller «apt-get dist-"
+#~ "upgrade» for å løse problemet."
 
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "De følgende pakkene er ikke oppgradert:"
+#~ msgstr "De følgende pakkene er ikke oppgradert: "
\ No newline at end of file
diff --git a/po/ne.po b/po/ne.po
old mode 100755
new mode 100644
index 52f3601e..8464d5da
--- 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-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-07-03 16:06+0545\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:19+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "MIME-Version: 1.0\n"
@@ -28,27 +28,30 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ"
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "कुञ्जि हटाउँदा त्रुटि"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा "
+"दिनुहोस"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -56,11 +59,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -82,7 +85,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -92,38 +94,40 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
+msgstr ""
+"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा "
+"दिनुहोस "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
+msgstr ""
+"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा "
+"दिनुहोस "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -136,7 +140,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -184,204 +187,185 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "स्तरवृद्धि समाप्त"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "परिवर्तनहरु डाउनलोड गर्दै"
+msgid "Installing updates"
+msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
 msgstr ""
+"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा "
+"दिनुहोस"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>विवरणहरु</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "स्थापना गर्नुहोस"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "स्तरवृद्धि समाप्त"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -389,11 +373,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -413,8 +396,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -427,51 +410,38 @@ msgid "Details"
 msgstr "<b>विवरणहरु</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "फेरि लोड गर्नुहोस"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -504,56 +474,52 @@ msgid "Changes"
 msgstr "परिवर्तनहरु"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "बर्णन"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "सफ्टवेयर अद्यावधिकहरु"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
@@ -629,7 +595,7 @@ msgid "_Check for updates automatically:"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -638,7 +604,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -660,14 +626,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>टिप्पणि:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>तत्वहरु</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>वितरण:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>सेक्सनहरु:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -684,17 +649,18 @@ msgstr "<b>युआरएल:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n"
+"<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट "
+"गर्नुहोस</b></big>\n"
 "\n"
-"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि <i>\"deb "
-"http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा "
-"विस्तृत विवरण पाउन सक्नुहुन्छ"
+"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य "
+"संरचनाको एउटा विस्तृत विवरण पाउन सक्नुहुन्छ"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -722,7 +688,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -770,146 +738,116 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "निषेधित प्रतिलिपि अधिकार"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "कार्यालय बाट समर्थित"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>सेक्सनहरु:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "सफ्टवेयर अद्यावधिकहरु"
@@ -944,6 +882,9 @@ msgstr ""
 #~ msgid "<b>Sources</b>"
 #~ msgstr "<b>सफ्टवेयर स्रोतहरु</b>"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>तत्वहरु</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>कोष</b>"
 
@@ -962,16 +903,18 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>प्रमाणीकरण कुञ्जिहरु</b></big>\n"
 #~ "\n"
-#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले डाउनलोड "
-#~ "गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले संभव पार्दछ"
+#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले "
+#~ "डाउनलोड गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले "
+#~ "संभव पार्दछ"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
-#~ "विश्वास गरिएको कुञ्जिरिंग मा एउटा नयाँ कुञ्जि फाइल थप्नुहोस. विश्वस्त हुनुहोस कि तपाईंले "
-#~ "एउटा सुरक्षित माध्यम माथि कुञ्जि प्राप्त गर्नुभयो र तपाईं मालिकलाइ विश्वास गर्नुहुन्छ. "
+#~ "विश्वास गरिएको कुञ्जिरिंग मा एउटा नयाँ कुञ्जि फाइल थप्नुहोस. विश्वस्त "
+#~ "हुनुहोस कि तपाईंले एउटा सुरक्षित माध्यम माथि कुञ्जि प्राप्त गर्नुभयो र तपाईं "
+#~ "मालिकलाइ विश्वास गर्नुहुन्छ. "
 
 #, fuzzy
 #~ msgid "Add repository..."
@@ -984,7 +927,7 @@ msgstr ""
 #~ msgstr "अस्थायी प्याकेजहरु फाइलहरु स्वत:सफा गर्नुहोस"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "दिनहरु मा समयान्तर सफा गर्नुहोस"
+#~ msgstr "दिनहरु मा समयान्तर सफा गर्नुहोस "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "प्याकेज क्यास मा पुरानो प्याकेजहरु मेट्नुहोस"
@@ -1000,11 +943,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले प्रयोगकर्ता "
-#~ "स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन"
+#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले "
+#~ "प्रयोगकर्ता स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन"
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "प्याकेज क्यासको लागि अधिकतम आकार सेट गर्नुहोस"
@@ -1016,7 +959,7 @@ msgstr ""
 #~ msgstr "अक्षम पारिएको सफ्टवेयर स्रोतहरु देखाउनुहोस"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "दिनहरुमा समयान्तर अद्यावधिक गर्नुहोस"
+#~ msgstr "दिनहरुमा समयान्तर अद्यावधिक गर्नुहोस "
 
 #~ msgid "_Add Repository"
 #~ msgstr "कोष थप्नुहोस"
@@ -1031,13 +974,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "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 "परिवर्तनलग को डाउनलोड रद्द गर्नुहोस"
@@ -1102,6 +1045,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "संस्करण %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
+
 #, fuzzy
 #~ msgid "There are no updated packages"
 #~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन"
@@ -1110,11 +1056,11 @@ msgstr ""
 #~ msgstr "स्तरवृद्धिहरु लागु हुँदैछन"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन सक्नुहुन्छ.कृपया पहिला "
-#~ "यो अन्य अनुप्रयोग बन्द गर्नुहोस"
+#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन "
+#~ "सक्नुहुन्छ.कृपया पहिला यो अन्य अनुप्रयोग बन्द गर्नुहोस"
 
 #~ msgid "Updating package list..."
 #~ msgstr "प्याकेज सुची स्तरवृद्धि गर्दै"
@@ -1131,22 +1077,23 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले चलाइरहेको संस्करण ले "
-#~ "सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त गर्नेछैन. कृपया स्तरवृद्धि जानकारी को "
-#~ "लागि http://www.ubuntulinux.org हेर्नुहोस"
+#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले "
+#~ "चलाइरहेको संस्करण ले सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त "
+#~ "गर्नेछैन. कृपया स्तरवृद्धि जानकारी को लागि http://www.ubuntulinux.org "
+#~ "हेर्नुहोस"
 
 #~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ! "
+#~ msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ.  कृपया स्तरवृद्धि निर्देशन को लागि://"
-#~ "www.ubuntulinux.org/ हेर्नुहोस."
+#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ.  कृपया स्तरवृद्धि निर्देशन को "
+#~ "लागि://www.ubuntulinux.org/ हेर्नुहोस."
 
 #~ msgid "Never show this message again"
 #~ msgstr "यो संदेश फेरि कहिले पनि नदेखाउनुहोस"
@@ -1157,7 +1104,8 @@ msgstr ""
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
+#~ msgstr ""
+#~ "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
 
 #~ msgid "Ubuntu Update Manager"
 #~ msgstr "युबन्टु अद्यावधिक व्यवस्थापक"
@@ -1172,24 +1120,24 @@ msgstr ""
 #~ msgstr "कोषहरु परिवर्तित"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप प्रति "
-#~ "भण्डारण गरिएको छ. बचत गर्नुहोस. \n"
+#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप "
+#~ "प्रति भण्डारण गरिएको छ. बचत गर्नुहोस. \n"
 #~ "\n"
-#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची  फेरि लोड "
-#~ "गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?"
+#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची  "
+#~ "फेरि लोड गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?"
 
 #~ msgid ""
 #~ "This means that some dependencies of the installed packages are not "
 #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
 #~ msgstr ""
-#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया स्थिति "
-#~ "ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस"
+#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया "
+#~ "स्थिति ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस"
 
 #~ msgid "It is not possible to upgrade all packages."
 #~ msgstr "सबै प्याकेजहरु स्तरवृद्धि गर्न संभव छैन"
@@ -1197,15 +1145,15 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
-#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै प्याकेजहरुको स्थापन "
-#~ "र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" "
-#~ "अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग गर्नुहोस"
+#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै "
+#~ "प्याकेजहरुको स्थापन र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि "
+#~ "साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग "
+#~ "गर्नुहोस"
 
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन"
+#~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन "
 
 #~ msgid "Initializing and getting list of updates..."
-#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै"
+#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै"
\ No newline at end of file
diff --git a/po/nl.po b/po/nl.po
index 04f44639..9abb4303 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-07-13 06:24+0100\n"
-"Last-Translator: Michiel Sikkes <michiels@gnome.org>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-18 12:07+0000\n"
+"Last-Translator: Michiel Sikkes <michiel@eyesopened.nl>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,27 +26,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -54,11 +55,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -80,7 +81,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -91,35 +91,33 @@ msgid ""
 "this as a bug. "
 msgstr ""
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -132,7 +130,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -179,199 +176,178 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-msgid "Applying changes"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -379,11 +355,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -403,8 +378,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -416,50 +391,38 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -492,56 +455,52 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
 msgstr ""
 
@@ -605,7 +564,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -614,7 +573,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -635,11 +594,11 @@ msgid "<b>Comment:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-msgid "<b>Components:</b>"
+msgid "<b>Distribution:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-msgid "<b>Distribution:</b>"
+msgid "<b>Sections:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
@@ -656,8 +615,8 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -687,7 +646,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -734,119 +695,96 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 msgid "Officially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr ""
\ No newline at end of file
diff --git a/po/pa.po b/po/pa.po
index d1423b14..c1b9914a 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-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-10-23 10:48-0200\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-18 12:07+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"
@@ -27,27 +27,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -81,7 +82,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -92,35 +92,33 @@ msgid ""
 "this as a bug. "
 msgstr ""
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -133,7 +131,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -180,200 +177,180 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-msgid "Applying changes"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+#, fuzzy
+msgid "Installing updates"
+msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>ਵੇਰਵਾ</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -381,11 +358,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -405,8 +381,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -419,50 +395,38 @@ msgid "Details"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
@@ -496,59 +460,55 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 #, fuzzy
 msgid "Show details"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
 msgid "Software Updates"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 #, fuzzy
 msgid "U_pgrade"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
@@ -620,7 +580,7 @@ msgid "_Check for updates automatically:"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -629,7 +589,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -652,14 +612,14 @@ msgid "<b>Comment:</b>"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>ਵੇਰਵਾ</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr ""
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+#, fuzzy
+msgid "<b>Sections:</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -677,8 +637,8 @@ msgstr "<b>ਵੇਰਵਾ</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -708,7 +668,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -756,131 +718,100 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 msgid "Officially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
\ No newline at end of file
diff --git a/po/pl.po b/po/pl.po
index 8bb5c6de..ea25c670 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,126 +1,135 @@
 # Polish translation of Update Manager.
 # Copyright (C) 2005 Zygmunt Krynicki <zyga@www.suxx.pl>
 # This file is distributed under the same license as the update-manager package.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-25 17:23+0100\n"
-"Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-26 19:34+0000\n"
+"Last-Translator: Tomasz Dominikowski <dominikowski@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"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Co %s dni"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Po %s dniach"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Zaimportuj klucz"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
-msgstr "Błąd podczas importu wybranego pliku"
+msgstr "Błąd podczas importowania wybranego pliku"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Błąd podczas usuwania klucza"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-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:406
+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ć ten błąd."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 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"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Proszę podać nazwę dla płyty"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Proszę włożyć płytę do napędu:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Pakiety są błędne"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"System zawiera błędne pakiety które nie mogły zostać naprawione. Przed "
+"kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub "
+"apt-get."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Nie można zaktualizować wymaganych meta-pakietów"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Niezbędny pakiet musiałby zostać usunięty"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Nie można przetworzyć aktualizacji"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
+msgstr ""
+"Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. Proszę "
+"zgłosić ten błąd. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Błąd podczas uwierzytelniania niektórych pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Nie można było uwierzytelnić niektórych pakietów. Może to być chwilowy błąd "
+"sieci. Można spróbować ponownie później. Poniżej znajduje się lista "
+"nieuwierzytelnionych pakietów."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Nie można zainstalować '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:233
 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."
+msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić ten błąd. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -128,46 +137,53 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Odczytywanie bufora podręcznego"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Nie odnaleziono poprawnych wpisów"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Podczas skanowaia informacji o repozytoriach nie odnaleziono poprawnych "
+"wpisów potrzebnych do aktualizacji.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Błędne informacje o repozytoriach"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę "
+"zgłosić ten błąd."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
-#, fuzzy
 msgid "Error during update"
-msgstr "Błąd podczas usuwania klucza"
+msgstr "Błąd podczas aktualizacji"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z "
+"siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Zbyt mało miejsca na dysku"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -176,221 +192,214 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Aktualizacja została przerwana. Proszę zwolnić co najmniej %s miejsca na "
+"dysku. Proszę opróżnić kosz i usunąć pliki tymczasowe z poprzednich "
+"instalacji używając 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Czy chcesz rozpocząć aktualizację?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem."
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Aktualizacja została przerwana. System może znajdować się w stanie "
+"nienadającym się do użytku. Proszę spróbować naprawić system używając "
+"polecenia \"sudo apt-get install -f\" lub poprzez Synaptic Menedżer Pakietów."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Pobranie aktualizacji było niemożliwe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz "
+"dysk instalacyjny i spróbować ponownie. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Usunąć niepotrzebne pakiety?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Błąd podczas zatwierdzania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Wystąpił problem podczas oczyszczania. Więcej informacji znajduje się w "
+"poniższych wiadomościach. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Działa inny menadżer pakietów"
+msgstr "Sprawdzanie menedżera pakietów"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Aktualizowanie informacji o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Pytanie o potwierdzenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Aktualizowanie zakończone"
+msgstr "Aktualizacja w toku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Aktualizacja systemu zakończona powodzeniem."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Proszę włożyć '%s' do napędu '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Pobieranie zostało zakończone."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s pozostało"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Pobieranie informacji o zmianach..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Instalowanie pakietów"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Nie można było zainstalować '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Wystąpił błąd krytyczny"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log oraz "
+"~/dist-upgrade-apt.log. Aktualizacja została przerwana. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakietów do usunięcia: %s."
+msgstr[1] "Pakietów do usunięcia: %s."
+msgstr[2] "Pakietów do usunięcia: %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nowych pakietów do zainstalowania: %s."
+msgstr[1] "Nowych pakietów do zainstalowania: %s."
+msgstr[2] "Nowych pakietów do zainstalowania: %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Pakietów do zaktualizowania: %s."
+msgstr[1] "Pakietów do zaktualizowania: %s."
+msgstr[2] "Pakietów do zaktualizowania: %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Konieczne pobranie ogółem %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i "
+"dokumenty."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Nie można było odnaleźć żadnych aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Twój system zawiera uszkodzone pakiety!"
+msgstr "System został już zaktualizowany."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Szczegóły</b>"
+msgstr "<b>Usuń %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Instaluj"
+msgstr "Instaluj %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Aktualizowanie zakończone"
+msgstr "Aktualizuj %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Wymagane ponowne uruchomienie komputera"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Aktualizacja została ukończona i należy ponownie uruchomić komputer. "
+"Uruchomić ponownie teraz?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -399,79 +408,71 @@ 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>Przerwać trwającą aktualizację?</big></b>\n"
+"\n"
+"System może stać się niezdatny do użytku jeśli aktualizacja zostanie "
+"przerwana. Zalecane jest kontynuowanie aktualizacji."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Uruchom ponownie komputer w celu zakończenia aktualizacji</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Rozpocząć aktualizację?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu \"Dapper\" "
+"6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Sprzątanie"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Szczegóły</b>"
+msgstr "Szczegóły"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Pobieranie i instalowanie aktualizacji"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modyfikowanie kanałów aktualizacji"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Przygotowywanie aktualizacji"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Ponowne uruchamianie systemu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "Aktualizacja Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Wczytaj ponownie"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "Zgłoś błąd"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "Uruchom ponownie"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Aktualizowanie zakończone"
+msgstr "Wznów aktualizację"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -480,6 +481,11 @@ msgid ""
 "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\"."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -488,118 +494,110 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Sprawdzanie dostępnych aktualizacji</b></big>\n"
+"\n"
+"Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty "
+"bezpieczeństwa i dostarczyć nowe funkcje."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Przerwij pobieranie"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Zmiany"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Sprawdź dostępne aktualizacje"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Opis"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Informacje o wydaniu"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "Wyświetl szczegóły"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Pokaż postęp pobierania poszczególnych plików"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Aktualizacje oprogramowania"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty "
+"bezpieczeństwa i dostarczyć nowe funkcje."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "Aktualizowanie zakończone"
+msgstr "Aktualizuj"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Zaktualizuj do najnowszej wersji Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "Sprawdź"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "Ukryj tę informację w przyszłości"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "_Instaluj"
+msgstr "_Instaluj aktualizacje"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Szczegóły</b>"
+msgstr "<b>Kanały</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Aktualizacje internetowe</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
-msgstr "<b>Szczegóły</b>"
+msgstr "<b>Klucze</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
 msgstr "Dodaj płytę _CD"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
-msgstr "A_utentykacja"
+msgstr "Uwierzytelnianie"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Usuń pobrane pliki oprogramowania:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Usuwa zaznaczony klucz z grupy zaufanych kluczy."
+msgstr "Zaimportuj publiczny klucz od zaufanego dostawcy oprogramowania"
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Instalacja pakietów..."
+msgstr "Nośnik instalacji"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Aktualizacje internetowe</b>"
+msgstr "Aktualizacje internetowe"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -609,13 +607,12 @@ msgid ""
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Przywraca domyślne klucze"
+msgstr "Przywróć domyślne klucze"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Przywróć domyślne klucze dystrybucji"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -623,19 +620,19 @@ msgstr "Ustawienia oprogramowania"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "Sprawdzaj dostępność aktualizacji automatycznie:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "Pobieraj aktualizacje w tle, ale ich nie instaluj"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "Instaluj aktualizacje bezpieczeństwa bez potwierdzania"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -646,27 +643,30 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Informacje o kanałach są nieaktualne</big></b>\n"
+"\n"
+"Musisz ponownie wczytać informacje o kanałach aby zainstalować "
+"oprogramowanie i aktualizacje z nowododanych lub zmienionych kanałów. \n"
+"\n"
+"Aby kontynuować potrzebne jest działające połączenie internetowe."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Szczegóły</b>"
+msgstr "<b>Kanał</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Komentarz:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Komponenty</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Dystrybucja:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sekcje:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>Sekcje:</b>"
 
@@ -679,20 +679,17 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Wpisz pełny wiersz APT opisujący repozytorium które chcesz dodać</"
-"b></big>\n"
+"<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ść repozytorium. Dla przykładu "
-"<i>\"deb http://ftp.debian.org sarge main\"</i>. Szczegółowy opis składni "
-"znajduje się w dokumentacji APT"
+"Wiersz APT zawiera typ, lokalizację i zawartość kanału. Dla przykładu "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -700,7 +697,7 @@ msgstr "Wiersz APT:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Dodaj kanał"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -712,28 +709,30 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Edytuj kanał"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Przeszukiwanie CD-ROMu"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "Dod_aj kanał"
+msgstr[1] "Dod_aj kanały"
+msgstr[2] "Dod_aj kanały"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr "_Zaawansowane"
+msgstr "Zaawansowane"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
 msgstr "Wczytaj ponownie"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Pokaż i zainstaluj dostępne aktualizacje"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -745,168 +744,132 @@ msgid ""
 "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."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Przypomnij o wczytaniu listy kanałów"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "Pokaż szczegóły poszczególnych aktualizacji"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Zapamiętuje rozmiar okna Menedżera aktualizacji"
 
 #: ../data/update-manager.schemas.in.h:5
 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"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Rozmiar okna"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 6.06"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Uaktualnienia Ubuntu 4.10"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Aktualizacje dla Ubuntu 6.06"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Uaktualnienia Ubuntu 4.10"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Aktualizacje dla Ubuntu 6.06 (Backporty)"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Uaktualnienia Ubuntu 4.10"
+msgstr "Aktualizacje dla Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Uaktualnienia Ubuntu 4.10"
+msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Wspierane oficjalnie"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "O ograniczonych prawach kopiowania"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Utrzymywane przez społeczność (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Nie-wolnodostępne (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Uaktualnienia bezpieczeństwa dla stabilnego Debiana"
+msgstr "Aktualizacje bezpieczeństwa dla Debiana 3.1 \"Sarge\""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (wersja testowa)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (wersja unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Wspierane oficjalnie"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Instalacja pakietów..."
+msgstr "Oprogramowanie niekompatybilne z DFSG."
 
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Wczytuje ponownie z serwera informacje o pakietach."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sekcje:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Aktualizacje oprogramowania"
@@ -954,13 +917,16 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Dostępne aktualizacje</b></big>\n"
 #~ "\n"
-#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
-#~ "klikając przycisk Instaluj."
+#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając "
+#~ "przycisk Instaluj."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Komponenty</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repozytorium</b>"
@@ -980,27 +946,26 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Klucze autentykacyjne</b></big>\n"
 #~ "\n"
-#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. "
-#~ "Klucz pozwala na sprawdzenie integralności oprogramowania które jest "
-#~ "pobierane z sieci."
+#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. Klucz "
+#~ "pozwala na sprawdzenie integralności oprogramowania które jest pobierane z "
+#~ "sieci."
 
 #~ msgid "A_uthentication"
 #~ msgstr "A_utentykacja"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Dodaje plik z kluczem do listy zaufanych kluczy. Należy upewnić sie, że "
-#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego "
-#~ "źródła. "
+#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego źródła. "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Usuwaj _tymczasowe pliki z pakietami"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "Co tyle dni:"
+#~ msgstr "Co tyle dni: "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "Usuwaj stare pakiety z pamięci p_odręcznej"
@@ -1016,11 +981,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to "
-#~ "na klucze zainstalowane przez użytkownika."
+#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to na "
+#~ "klucze zainstalowane przez użytkownika."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "Maksymalny rozmiar pamięci podręcznej"
@@ -1044,9 +1009,8 @@ msgstr ""
 #~ "This means that some dependencies of the installed packages are not "
 #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
 #~ msgstr ""
-#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione."
-#~ "Aby rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-"
-#~ "get\"."
+#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione.Aby "
+#~ "rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-get\"."
 
 #~ msgid "It is not possible to upgrade all packages."
 #~ msgstr "Nie można uaktualnić wszystkich pakietów"
@@ -1054,13 +1018,12 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
 #~ "Oznacza to, że do aktualizacji wymagane sa dodatkowe działania (takie jak "
-#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać "
-#~ "z funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać "
-#~ "polecenie \"apt-get dist-upgrade\"."
+#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać z "
+#~ "funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać polecenie "
+#~ "\"apt-get dist-upgrade\"."
 
 #~ msgid "The following packages are not upgraded: "
 #~ msgstr "Następujące pakiety nie są aktualizowane: "
@@ -1074,21 +1037,24 @@ msgstr ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
-#~ "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić czy "
-#~ "połączenie z internetem jest aktywne"
+#~ "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić czy połączenie "
+#~ "z internetem jest aktywne"
 
 #~ msgid "Version %s: \n"
 #~ msgstr "Wersja %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Pobieranie informacji o zmianach..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Aktualizacje są teraz instalowane."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. "
-#~ "Należy najpierw zamknąć aplikację która teraz działa."
+#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. Należy "
+#~ "najpierw zamknąć aplikację która teraz działa."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Aktualizacja listy pakietów..."
@@ -1107,14 +1073,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna "
-#~ "wersja nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych "
-#~ "krytycznych uaktualnień. Informacje o tym jak uaktualnić dystrybucję "
-#~ "można znaleźć na stronie http://www.ubuntulinux.org (Witryna w języku "
-#~ "angielskim)"
+#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna wersja "
+#~ "nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych krytycznych "
+#~ "uaktualnień. Informacje o tym jak uaktualnić dystrybucję można znaleźć na "
+#~ "stronie http://www.ubuntulinux.org (Witryna w języku angielskim)"
 
 #, fuzzy
 #~ msgid "There is a new release of Ubuntu available!"
@@ -1125,11 +1090,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. "
-#~ "Należy najpierw zamknąć aplikację która teraz działa."
+#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. Należy "
+#~ "najpierw zamknąć aplikację która teraz działa."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Inicjowanie i pobieranie listy aktualizacji..."
@@ -1177,28 +1142,28 @@ msgstr ""
 #~ msgstr "Repozytoria zmienione"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "Zmieniły się informacje o repozytoriach. Kopia zapasowa oryginalnego "
-#~ "pliku sources.list została zapisana w %s.save. \n"
+#~ "Zmieniły się informacje o repozytoriach. Kopia zapasowa oryginalnego pliku "
+#~ "sources.list została zapisana w %s.save. \n"
 #~ "\n"
-#~ "Należy ponownie odczytać listę pakietów z serwerów aby zmiany były "
-#~ "widoczne. Czy chcesz zrobić to teraz?"
+#~ "Należy ponownie odczytać listę pakietów z serwerów aby zmiany były widoczne. "
+#~ "Czy chcesz zrobić to teraz?"
 
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Dostępne aktualizacje</b></big>\n"
 #~ "\n"
-#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
-#~ "klikając przycisk Instaluj."
+#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając "
+#~ "przycisk Instaluj."
 
 #~ msgid "CD disk"
-#~ msgstr "Płyta CD"
+#~ msgstr "Płyta CD"
\ No newline at end of file
diff --git a/po/pt.po b/po/pt.po
index 1df5c9b3..64819920 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,48 +6,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-29 13:36-0300\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-25 21:49+0000\n"
 "Last-Translator: Rui Az. <astronomy@mail.pt>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.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:104
 #, python-format
 msgid "Every %s days"
-msgstr "Todos os % dias"
+msgstr "Todos os %s dias"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
 msgstr "Depois de %s dias"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr "Importar chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Erro ao importar ficheiro seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar "
 "corrompido."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Erro ao remover a chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "A chave que seleccionou não pôde ser removida. Por favor reporte este erro."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -58,11 +60,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr "Por favor introduza um nome para o disco"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor introduza um disco no leitor:"
 
@@ -87,7 +89,6 @@ msgstr "Não foi possível actualizar os meta-pacotes necessários"
 msgid "A essential package would have to be removed"
 msgstr "Um pacote essencial teria que ser removido"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr "Impossível de calcular a actualização"
@@ -100,12 +101,11 @@ msgstr ""
 "Um problema irresolúvel ocorreu ao calcular a actualização. Por favor "
 "reporte este erro. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr "Erro ao autenticar alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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 "
@@ -115,24 +115,23 @@ msgstr ""
 "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma "
 "lista de pacotes não autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossível de instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 "Foi impossível instalar um pacote essencial. Por favor reporte este erro. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr "Impossível de descobrir meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -150,7 +149,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr "A ler a cache"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr "Nenhuma entrada válida encontrada"
@@ -189,9 +187,8 @@ msgstr ""
 "tentar."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
-#, fuzzy
 msgid "Not enough free disk space"
-msgstr "Não existe espaço livre suficiente"
+msgstr "Não existe espaço livre em disco suficiente"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -200,57 +197,49 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"A actualização abortará. Por favor liberte pelo menos %s de espaço em disco. "
+"Esvazie o Lixo e remova pacotes temporários de instalações anteriores usando "
+"'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
-#, fuzzy
 msgid "Do you want to start the upgrade?"
-msgstr "Impossível de calcular a actualização"
+msgstr "Deseja iniciar a actualização?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
-#, fuzzy
 msgid "Could not install the upgrades"
-msgstr "Impossível de calcular a actualização"
+msgstr "Impossível de instalar as actualizações"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
-#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
-"Ocorreu algum problema durante a actualização. Provavelmente a instalação de "
-"alguns pacotes falhou. Tente 'sudo apt-get install -f' ou use o synaptic "
+"A actualização abortará agora. O seu sistema poderá estar num estado "
+"inutilizável. Por favor tente 'sudo apt-get install -f' ou use o Synaptic "
 "para corrigir o seu sistema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr "Impossível de calcular a actualização"
+msgstr "Impossível de descarregar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"A actualização abortará agora. Por favor verifique a sua ligação à internet "
+"ou media de instalação e volte a tentar. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-#, fuzzy
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
+#, fuzzy
 msgid "Error during commit"
-msgstr ""
+msgstr "Erro ao submeter"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -259,177 +248,161 @@ msgstr ""
 "abaixo para mais informação. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
 msgstr "A verificar gestor de pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr "A Actualizar informação de repositórios"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr "A pedir confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
 msgstr "A actualizar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr "À procura de software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr "A actualização do sistema está completa."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no leitor '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr "O Download está completo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr "A fazer o download de ficheiro %li de %li com %s/s"
+msgstr "A descarregar ficheiro %li de %li com %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr "%s restantes"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr "A fazer o download de ficheiro %li de %li a velocidade desconhecida"
+msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
 
 #. 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:136
-msgid "Applying changes"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "A instalar actualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "A actualização abortará. Reporte este erro."
+msgstr "A actualização abortará agora. Reporte este erro."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
-"Durante a operação ocorreu um erro fatal. 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. "
+"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. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] "Um pacote essencial teria que ser removido"
-msgstr[1] "Um pacote essencial teria que ser removido"
+msgstr[0] "%s pacote será removido."
+msgstr[1] "%s pacotes serão removidos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s novo pacote será instalado."
+msgstr[1] "%s novos pacotes serão instalados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pacote será actualizado."
+msgstr[1] "%s pacotes serão actualizados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Tem de efectuar o download de um total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Para prevenir a perda de dados feche todas as aplicações e documentos "
+"abertos."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr "Impossível de calcular a actualização"
+msgstr "Impossível de encontrar quaisquer actualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "O seu sistema tem pacotes quebrados!"
+msgstr "O seu sistema já foi actualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>A ser removido: %s</b>"
+msgstr "<b>Remover %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Instalar Actualizações"
+msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "A_ctualização"
+msgstr "Actualizar %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr "Necessário reiniciar"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"A actualização terminou agora. É necessário reiniciar, deseja efectuá-lo "
-"agora?"
+"A actualização terminou e é necessário reiniciar. Deseja reiniciar agora?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -438,6 +411,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>Cancelar a actualização em curso?</big></b>\n"
+"\n"
+"O sistema poderá ser deixado num estado inutilizável se cancelar a "
+"actualização. É aconselhado a prosseguir com a actualização."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
@@ -449,8 +426,8 @@ msgstr "<b><big>Iniciar a actualização?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu \"Dapper\" "
 "6.04</span>"
@@ -464,54 +441,40 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr "A efectuar o download e a instalar actualizações"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "A modificar os repositórios de software"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr "A preparar actualização"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "A reiniciar o sistema"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr "A actualizar o Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Reler"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr "_Reportar um erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr "_Reiniciar agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Efectuar Actualização?"
+msgstr "_Retomar Actualização?"
 
 #: ../data/UpdateManager.glade.h:1
 #, fuzzy
@@ -521,8 +484,8 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
-"<b><big>Tem de reler manualmente a última informação sobre actualizações</"
-"big></b>\n"
+"<b><big>Tem de reler manualmente a última informação sobre "
+"actualizações</big></b>\n"
 "\n"
 "O seu sistema não procura por actualizações automaticamente. Pode configurar "
 "este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do "
@@ -553,35 +516,30 @@ msgid "Changes"
 msgstr "Alterações"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
-#, fuzzy
 msgid "Check for available updates"
-msgstr "A efectuar o download e a instalar actualizações"
+msgstr "Verificar por actualizações disponíveis"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Descrição"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr "Notas de lançamento"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr "Mostrar detalhes"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr "Mostrar progresso de ficheiros individuais"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Actualizações de Software"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
@@ -589,37 +547,37 @@ msgstr ""
 "Actualizações de software podem corrigir erros, eliminar problemas de "
 "segurança, e fornecer novas funcionalidades."
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr "A_ctualização"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr "Actualize para a última versão do Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Verificar"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Ocultar esta informação no futuro"
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
 msgstr "_Instalar Actualizações"
 
 #: ../data/SoftwareProperties.glade.h:1
 msgid "<b>Channels</b>"
-msgstr ""
+msgstr "<b>Repositórios</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
 msgid "<b>Internet updates</b>"
-msgstr ""
+msgstr "<b>Actualizações Internet</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
 msgid "<b>Keys</b>"
-msgstr ""
+msgstr "<b>Chaves</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
@@ -631,7 +589,7 @@ msgstr "Autenticação"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr "Apagar ficheiros descarregados:"
+msgstr "A_pagar ficheiros descarregados:"
 
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
@@ -639,11 +597,11 @@ msgstr "Importar a chave pública de um fornecedor de software confiável"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr ""
+msgstr "Media de Instalação"
 
 #: ../data/SoftwareProperties.glade.h:9
 msgid "Internet Updates"
-msgstr ""
+msgstr "Actualizações Internet"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
@@ -651,6 +609,9 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Apenas actualizações de segurança dos servidores oficiais do Ubuntu serão "
+"instaladas automaticamente. O pacote de software \"unattended-upgrades\" "
+"necessita de estar instalado."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -669,18 +630,16 @@ msgid "_Check for updates automatically:"
 msgstr "_Procurar por actualizações automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-#, fuzzy
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
 
 #: ../data/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "_Install security updates without confirmation"
-msgstr "_Instalar novas actualizações sem confirmação"
+msgstr "_Instalar actualizações de segurança sem confirmação"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -691,35 +650,37 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>A informação de repositórios está desactualizada</big></b>\n"
+"\n"
+"Tem de reler a informação de repositórios para instalar software e "
+"actualizações a partir de repositórios recentemente adicionados ou "
+"alterados. \n"
+"\n"
+"Necessita de uma ligação internet activa para continuar."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Componentes</b>"
+msgstr "<b>Repositórios</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
-#, fuzzy
 msgid "<b>Comment:</b>"
-msgstr "<b>Componentes</b>"
+msgstr "<b>Comentários:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Componentes</b>"
+msgid "<b>Distribution:</b>"
+msgstr "<b>Distribuição:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-msgid "<b>Distribution:</b>"
-msgstr ""
+msgid "<b>Sections:</b>"
+msgstr "<b>Secções:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Fontes de Software</b>"
+msgstr "<b>Secções</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
-#, fuzzy
 msgid "<b>Type:</b>"
-msgstr "<b>URI:</b>"
+msgstr "<b>Tipo:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
@@ -727,12 +688,17 @@ msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
+"<big><b>Introduza uma linha completa APT para o repositório que deseja "
+"adicionar</b></big>\n"
+"\n"
+"A linha APT contém o tipo, localização e secções de um repositório, por "
+"exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -740,42 +706,45 @@ msgstr "Linha do APT:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Adicionar Repositório"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"Binário\n"
+"Fonte"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Editar Repositório"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "A pesquisar o CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Adicionar Repositório"
+msgstr[1] "_Adicionar Repositórios"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr ""
+msgstr "_Personalizado"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 msgid "_Reload"
-msgstr "Reler"
+msgstr "_Reler"
 
 #: ../data/update-manager.desktop.in.h:1
-#, fuzzy
 msgid "Show and install available updates"
-msgstr "A efectuar o download e a instalar actualizações"
+msgstr "Mostrar e instalar actualizações disponíveis"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr ""
+msgstr "Gestor de Actualizações"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -783,164 +752,131 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Se a opção para verificar automaticamente por actualizações estiver "
+"desactivada, tem de reler a lista de repositórios manualmente. Esta opção "
+"permite desactivar a lembrança mostrada neste caso."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Relembrar reler a lista de repositórios"
 
 #: ../data/update-manager.schemas.in.h:3
-#, fuzzy
 msgid "Show details of an update"
-msgstr "Mostrar detalhes"
+msgstr "Mostrar detalhes de uma actualização"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Guarda o tamanho do diálogo do gestor de actualizações"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Guarda o estado da lista que contém a lista de alterações e a descrição"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Tamanho da Janela"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 6.04 \"Dapper Drake\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 Actualizações de Segurança"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 Actualizações de Segurança"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.10 Actualizações"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 Actualizações"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.10 Actualizações"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 Backports"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Actualizações"
+msgstr "Ubuntu 5.10 Backports"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Suportado Oficialmente"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Direitos de autor restritos"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Mantido pela comunidade (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian \"Etch\" (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr "Suportado Oficialmente"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatível-DFSG com Dependências Não-Livres"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
-#~ msgid "Installing updates"
-#~ msgstr "A instalar actualizações"
-
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Reler a última informação sobre actualizações"
 
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Fontes de Software</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizações de Software"
@@ -950,8 +886,8 @@ msgstr "Software compatível-DFSG"
 #~ "\n"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">A efectuar download de alterações</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">A efectuar download de "
+#~ "alterações</span>\n"
 #~ "\n"
 #~ "É necessário obter as alterações de um servidor central"
 
@@ -960,8 +896,8 @@ msgstr "Software compatível-DFSG"
 
 #~ msgid ""
 #~ "There is not enough free space on your system to download the required "
-#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-"
-#~ "get clean'"
+#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+#~ "clean'"
 #~ msgstr ""
 #~ "Não existe espaço suficiente no seu sistema para descarregar os pacotes "
 #~ "necessários. Por favor liberte algum espaço antes de tentar novamente por "
@@ -974,8 +910,8 @@ msgstr "Software compatível-DFSG"
 #~ "Some problem occured during the fetching of the packages. This is most "
 #~ "likely a network problem. Please check your network and try again. "
 #~ msgstr ""
-#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de "
-#~ "um problema de rede. Por favor verifique a rede e tente novamente. "
+#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de um "
+#~ "problema de rede. Por favor verifique a rede e tente novamente. "
 
 #~ msgid ""
 #~ "%s packages are going to be removed.\n"
@@ -1000,8 +936,8 @@ msgstr "Software compatível-DFSG"
 #~ msgstr "Tem a certeza que pretende cancelar?"
 
 #~ msgid ""
-#~ "Canceling during a upgrade can leave the system in a unstable state. It "
-#~ "is strongly adviced to continue the operation. "
+#~ "Canceling during a upgrade can leave the system in a unstable state. It is "
+#~ "strongly adviced to continue the operation. "
 #~ msgstr ""
 #~ "Cancelar durante uma actualização pode deixar o seu sistema num estado "
 #~ "instável. É fortemente aconselhado a prosseguir a operação. "
@@ -1022,4 +958,4 @@ msgstr "Software compatível-DFSG"
 #~ msgstr "Propriedades dos Software"
 
 #~ msgid "CD"
-#~ msgstr "CD"
+#~ msgstr "CD"
\ No newline at end of file
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0ad1e2d3..b530a5ed 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,15 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2006-02-19 17:39-0300\n"
-"Last-Translator: Carlos Eduardo Pedroza Santiviago <segfault@ubuntu.com>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 01:47+0000\n"
+"Last-Translator: LKRaider <paul@eipper.com.br>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
@@ -25,31 +26,32 @@ msgstr "A cada %s dias"
 msgid "After %s days"
 msgstr "Após %s dias"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr "Importar Chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Erro importando o arquivo selecionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 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 "
 "corrompido."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Erro removendo a chave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+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."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -60,11 +62,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr "Por favor digite um nome para o disco"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor insira um disco no drive:"
 
@@ -89,7 +91,6 @@ msgstr "Não foi possível atualizar os meta-pacotes requeridos"
 msgid "A essential package would have to be removed"
 msgstr "Um pacote essencial teria que ser removido"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr "Não foi possível calcular a atualização"
@@ -100,14 +101,13 @@ msgid ""
 "this as a bug. "
 msgstr ""
 "Um problema sem resolução ocorreu enquanto calculando a atualização. Por "
-"favor reporte isto como um erro."
+"favor reporte isto como um erro. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr "Erro autenticando alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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 "
@@ -117,25 +117,24 @@ msgstr ""
 "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes "
 "não-autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 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."
+"um erro. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr "Não foi possível adivinhar o meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -153,7 +152,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Lendo cache"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr "Nenhuma entrada válida encontrada"
@@ -192,9 +190,8 @@ msgstr ""
 "novamente."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
-#, fuzzy
 msgid "Not enough free disk space"
-msgstr "Espaço em disco insuficiente"
+msgstr "Não há espaço suficiente no disco"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -203,233 +200,205 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"A atualização será abortada agora. Por favor, libere ao menos %s de espaço "
+"em disco. Limpe a sua lixeira e remova pacotes temporários de instalações "
+"anteriores executando 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
-#, fuzzy
 msgid "Do you want to start the upgrade?"
-msgstr "Não foi possível calcular a atualização"
+msgstr "Você quer iniciar a atualização?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
-#, fuzzy
 msgid "Could not install the upgrades"
-msgstr "Não foi possível calcular a atualização"
+msgstr "Não foi possível instalar as atualizações"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
-#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
-"Alguns problemas ocorreram durante a atualização. É bem provável que alguns "
-"pacotes falharam ao instalar. Tente 'sudo apt-get install -f' ou Synaptic "
-"para corrigir o seu sistema."
+"A atualização será abortada agora. Seu sistema pode estar em um estado "
+"inutilizável. Por favor tente executar 'sudo apt-get install -f' ou entrar "
+"no Synaptic para corrigir o seu sistema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr "Não foi possível calcular a atualização"
+msgstr "Não foi possível obter as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"A atualização será abortada agora. Por favor verifique sua conexão à "
+"Internet ou mídia de instalação e tente de novo. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-#, fuzzy
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr "Erro ao aplicar as mudanças"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 "Alguns problemas ocorreram durante a limpeza. Por favor veja as mensagens "
-"abaixo para maiores informações."
+"abaixo para maiores informações. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
 msgstr "Verificando o Gerenciador de Pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr "Atualizando informação do repositório"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr "Pedindi por confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
 msgstr "Atualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr "Buscando programas obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr "A Atualização do Sistema está completa."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no drive '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr "O Download está completo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr "Obtendo arquivo %li de %li com %s/s"
+msgstr "Obtendo arquivo %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr "Faltam %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr "Obtendo arquivo %li de %li com velocidade desconhecida"
+msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Downloading changes..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Instalando Atualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "A atualização irá abortar. Por favor reporte o erro."
+msgstr "A atualização será abortada agora. Por favor reporte este erro."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
-"Durante a operação um erro fatal ocorreu. Por favor reporte isso como um "
-"erro e inclua os arquivos ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu "
-"relatório. A atualização irá abortar agora."
+"Por favor reporte isto como um bug e inclua os arquivos ~/dist-upgrade.log e "
+"~/dist-upgrade-apt.log em seu relatório. O upgrade abortará agora. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] "Um pacote essencial teria que ser removido"
-msgstr[1] "Um pacote essencial teria que ser removido"
+msgstr[0] "%s pacote será removido."
+msgstr[1] "%s pacotes serão removidos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s novo pacote será instalado."
+msgstr[1] "%s novos pacotes serão instalados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pacote será atualizado."
+msgstr[1] "%s pacotes serão atualizados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Você precisa obter um total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "Para evitar perda de dados, feche todas as aplicações e documentos."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr "Não foi possível calcular a atualização"
+msgstr "Não foi possível encontrar nenhuma atualização"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Your system has broken packages!"
+msgstr "Seu sistema já foi atualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>A serem removidos: %s </b>"
+msgstr "<b>Remover %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "_Instalar Atualizações"
+msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "At_ualizar"
+msgstr "Atualizar %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr "Reinicialização requerida"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"A atualização está terminada. É necessário reiniciar o computador, você "
+"A atualização está terminada e é necessário reiniciar o computador. Você "
 "deseja fazer isso agora?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
@@ -442,10 +411,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>Cancelar a atualização em progresso?</big></b>\n"
+"\n"
+"O sistema pode ficar inutilizável se você cancelar a atualização. É "
+"altamente recomendável que você prossiga com a atualização."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr "<b><big>Reinicie o seu sistema para finalizar a atualização</big></b>"
+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>"
@@ -453,8 +427,8 @@ msgstr "<b><big>Iniciar a Atualização?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu \"Dapper\" "
 "6.04</span>"
@@ -468,70 +442,53 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr "Obtendo e instalando as atualizações"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr "Modificando os canais de programas"
+msgstr "Modificando os canais de software"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr "Preparando a Atualização"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Reiniciando o sistema"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr "Atualizando o Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "_Recarregar"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr "Reportar _Erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr "_Reiniciar Agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Realizar a Atualização?"
+msgstr "Continua_r Atualização"
 
 #: ../data/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 \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
-"<b><big>Você precisa recarregar manualmente as últimas informações sobre "
-"atualizações</big></b>\n"
+"<b><big>Você deve verificar as atualizações manualmente</big></b>\n"
 "\n"
-"O seu sistema não verifica automaticamente por atualizações. Você pode "
-"configurar esse comportamento em \"Sistema\" -> \"Administração\" -> "
-"\"Propriedades de Programas\"."
+"O seu sistema não procura por atualizações automaticamente. Você pode "
+"configurar essa opção em \"Sistema\" -> \"Administração\" -> \"Propriedades "
+"de Programas\"."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -558,35 +515,30 @@ msgid "Changes"
 msgstr "Mudanças"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
-#, fuzzy
 msgid "Check for available updates"
-msgstr "Obtendo e instalando as atualizações"
+msgstr "Procurar updates disponíveis"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Descrição"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr "Notas de Versão"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr "Exibir Detalhes"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr "Exibir progresso de arquivos únicos"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Atualizações de Programas"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
@@ -594,23 +546,23 @@ msgstr ""
 "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de "
 "segurança, e prover novas funcionalidades para você."
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr "At_ualizar"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr "Atualizar para a última versão do Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Verificar"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Ocultar esta informação no futuro"
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
 msgstr "_Instalar Atualizações"
 
@@ -656,6 +608,9 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Somente atualizações de segurança do servidor oficial do Ubuntu serão "
+"instaladas automaticamente. O pacote \"unattended-upgrades\" precisa ser "
+"instalado para isso."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -674,19 +629,16 @@ msgid "_Check for updates automatically:"
 msgstr "Verifi_car por atualizações automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-#, fuzzy
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr "_Obter atualizações em segundo plano, mas não instalá-las"
 
 #: ../data/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "_Install security updates without confirmation"
-msgstr "_Instalar novas atualizações sem confirmação"
+msgstr "_Instalar novas atualizações de segurança sem confirmação"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
-#, fuzzy
 msgid "     "
-msgstr "    "
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -697,29 +649,32 @@ msgid ""
 "\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."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Canais</b>"
+msgstr "<b>Canal</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Components</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Sections:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Sections:</b>"
+msgstr "<b>Seções</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -730,20 +685,18 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Enter the complete APT line of the repository that you want to add</"
-"b></big>\n"
+"<big><b>Insira a linha completa do APT do canal que você quer "
+"adicionar</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."
+"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>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -751,7 +704,7 @@ msgstr "APT line:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Adicionar Canal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -763,15 +716,17 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Editar Canal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Procurando no CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "_Adicionar Canal"
+msgstr[1] "_Adicionar Canais"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -782,9 +737,8 @@ msgid "_Reload"
 msgstr "_Recarregar"
 
 #: ../data/update-manager.desktop.in.h:1
-#, fuzzy
 msgid "Show and install available updates"
-msgstr "Obtendo e instalando as atualizações"
+msgstr "Exibir e instalar as atualizações disponíveis"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -796,163 +750,131 @@ msgid ""
 "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."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Lembrar de recarregar a lista de canais"
 
 #: ../data/update-manager.schemas.in.h:3
-#, fuzzy
 msgid "Show details of an update"
-msgstr "Exibir Detalhes"
+msgstr "Exibir detalhes de uma atualização"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Armazena o tamanho do diálogo do update-manager"
 
 #: ../data/update-manager.schemas.in.h:5
 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"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "O tamanho da janela"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Atualizações de Segurança do Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Atualizações do Ubuntu 5.10"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Atualizações do Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Atualizações do Ubuntu 5.10"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Backports do Ubuntu 6.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Atualizações de Segurança do Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Atualizações do Ubuntu 5.10"
+msgstr "Backports do Ubuntu 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
-msgstr "Suportado Oficialmente"
+msgstr "Suporte oficial"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Restrito por copyright"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Mantido pela Comunidade (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian \"Etch\" (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr "Suportado Oficialmente"
 
-#. CompDescription
 #: ../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"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
-#~ msgid "Installing updates"
-#~ msgstr "Instalando Atualizações"
-
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Recarregar as últimas informações sobre atualizações"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Modificando os canais de programas"
@@ -984,12 +906,12 @@ msgstr "Programas não compatíveis com a DFSG"
 
 #~ msgid ""
 #~ "There is not enough free space on your system to download the required "
-#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-"
-#~ "get clean'"
+#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+#~ "clean'"
 #~ msgstr ""
 #~ "Não há espaço suficiente no seu sistema para obter os pacotes requeridos. "
-#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-"
-#~ "get clean'"
+#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-get "
+#~ "clean'"
 
 #~ msgid "Error fetching the packages"
 #~ msgstr "Erro ao obter os pacotes"
@@ -999,8 +921,8 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ "likely a network problem. Please check your network and try again. "
 #~ msgstr ""
 #~ "Alguns problemas ocorreram durante a obtenção dos pacotes. Isso é bem "
-#~ "provável que seja por problemas de rede. Por favor verifique a sua "
-#~ "conexão de rede e tente novamente."
+#~ "provável que seja por problemas de rede. Por favor verifique a sua conexão "
+#~ "de rede e tente novamente. "
 
 #~ msgid ""
 #~ "%s packages are going to be removed.\n"
@@ -1025,11 +947,11 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgstr "Tem certeza que deseja cancelar?"
 
 #~ msgid ""
-#~ "Canceling during a upgrade can leave the system in a unstable state. It "
-#~ "is strongly adviced to continue the operation. "
+#~ "Canceling during a upgrade can leave the system in a unstable state. It is "
+#~ "strongly adviced to continue the operation. "
 #~ msgstr ""
-#~ "Cancelar durante a atualização pode deixar o sistema em um estado "
-#~ "instável. É fortemente recomendável que a operação continue."
+#~ "Cancelar durante a atualização pode deixar o sistema em um estado instável. "
+#~ "É fortemente recomendável que a operação continue. "
 
 #, fuzzy
 #~ msgid "<b>Sources</b>"
@@ -1052,13 +974,16 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ 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."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Components</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Repository</b>"
@@ -1078,16 +1003,16 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgstr ""
 #~ "<big><b>Authentication keys</b></big>\n"
 #~ "\n"
-#~ "You can add and remove authentication keys in this dialogue. A key makes "
-#~ "it possible to check verify the integrity of the software you download."
+#~ "You can add and remove authentication keys in this dialogue. A key makes it "
+#~ "possible to check verify the integrity of the software you download."
 
 #~ msgid "A_uthentication"
 #~ msgstr "A_uthentication"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Add a new key file to the trusted keyring. Make sure that you got the key "
 #~ "over a secure channel and that you trust the owner. "
@@ -1112,11 +1037,11 @@ msgstr "Programas não compatíveis com a DFSG"
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Restore the default keys shiped with the distribution. This will not "
-#~ "change user-installed keys."
+#~ "Restore the default keys shiped with the distribution. This will not change "
+#~ "user-installed keys."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "Set _maximum size for the package cache"
@@ -1149,13 +1074,11 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 
 #~ msgid "The following packages are not upgraded: "
 #~ msgstr "The following packages are not upgraded: "
@@ -1173,15 +1096,18 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Downloading changes..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "The updates are being applied."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Updating package list..."
@@ -1200,33 +1126,33 @@ msgstr "Programas não compatíveis com a DFSG"
 
 #~ 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."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "There is a new release of Ubuntu available!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 
 #~ msgid "Never show this message again"
 #~ msgstr "Never show this message again"
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Initializing and getting list of updates..."
@@ -1274,14 +1200,14 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgstr "Repositories changed"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
 #~ msgstr ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1289,10 +1215,10 @@ msgstr "Programas não compatíveis com a DFSG"
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
\ No newline at end of file
diff --git a/po/ro.po b/po/ro.po
index 2830f823..0d37d728 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,65 +2,76 @@
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the update-manager package.
 # Dan Damian <dand@gnome.ro>, 2005.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-03 19:28+0200\n"
-"Last-Translator: Dan Damian <dand@gnome.ro>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:19+0000\n"
+"Last-Translator: Dan Damian <dand@codemonkey.ro>\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"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
-#, python-format
+#, fuzzy
 msgid "Every %s days"
-msgstr ""
+msgstr "La fiecare %s zile"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "După %s zile"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
+#, fuzzy
 msgid "Import key"
-msgstr ""
+msgstr "Importă cheie"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
+#, fuzzy
 msgid "Error importing selected file"
-msgstr ""
+msgstr "Eroare la importarea fişierului ales"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr ""
+msgstr "Fişierul selectat nu pare a fi o cheie GPG sau poate fi corupt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
-msgstr ""
+msgstr "Eroare la ştergerea cheii."
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+#, fuzzy
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
+"Cheia selectată nu poate fi ştearsă. Raportaţi acest lucru ca un bug "
+"(eroare)."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Eroare la scanarea CD-ului</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Introduceţi un nume pentru disc"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
+#, fuzzy
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Introduceţi un disc în dispozitiv:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
@@ -80,7 +91,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -91,35 +101,36 @@ msgid ""
 "this as a bug. "
 msgstr ""
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Nu pot instala '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
+#, fuzzy
 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). "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -130,9 +141,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Citire cache"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -179,203 +189,184 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Un alt manager de pachete rulează"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualizare completă"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Descarc modificările..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sistemul dvs. este la zi!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Detalii</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Instalează"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Actualizare completă"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -383,7 +374,6 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
@@ -407,8 +397,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -421,50 +411,38 @@ msgid "Details"
 msgstr "<b>Detalii</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Actualizare completă"
@@ -498,57 +476,53 @@ msgid "Changes"
 msgstr "Modificări"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Descriere"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Actualizări software"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Actualizare completă"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "_Instalează"
@@ -620,7 +594,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -630,7 +604,7 @@ msgstr ""
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 #, fuzzy
 msgid "     "
-msgstr "    "
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -652,14 +626,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Comentariu:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Componente</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribuţie:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Secţiuni:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -676,8 +649,8 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -685,9 +658,9 @@ msgstr ""
 "<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o "
 "adăugaţi</b></big>\n"
 "\n"
-"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de exemplu<i>"
-"\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere "
-"detaliată a sintaxei în documentaţie."
+"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de "
+"exemplu<i>\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o "
+"descriere detaliată a sintaxei în documentaţie."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -715,7 +688,10 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -763,130 +739,107 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Pachete suportate oficial"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Copyright restrictiv"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Pachete non-libere (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Actualizări de securitate Debian Stable"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Pachete suportate oficial"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
@@ -895,9 +848,6 @@ msgstr ""
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Reîncarcă informaţiile despre pachete de pe server."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secţiuni:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Actualizări software"
@@ -934,13 +884,16 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Actualizări disponibile</b></big>\n"
 #~ "\n"
-#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
-#~ "apăsând pe butonul Instalează."
+#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând "
+#~ "pe butonul Instalează."
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Componente</b>"
 
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Locaţie</b>"
@@ -960,8 +913,8 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Chei autentificare</b></big>\n"
 #~ "\n"
-#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul "
-#~ "unei chei estede a permite verificarea integrităţii unui pachet software "
+#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul unei "
+#~ "chei estede a permite verificarea integrităţii unui pachet software "
 #~ "descărcat."
 
 #~ msgid "A_uthentication"
@@ -969,12 +922,12 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Adăugaţi o nouă cheie în keyring-ul de încredere. Asiguraţi-vă că aţi "
 #~ "obţinut cheia printr-un canal sigur şi că aveţi încredere în proprietarul "
-#~ "ei."
+#~ "ei. "
 
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Curăţă automat fişierele _temporare ale pachetelor"
@@ -987,8 +940,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Restaurează cheile implicite furnizate împreună cu distribuţia. Această "
 #~ "acţiune nu va influenţa cheile instalate ca utilizator."
@@ -1019,12 +972,15 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Versiunea %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Descarc modificările..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Actualizările sunt în curs de aplicare."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să "
 #~ "închideţi ceilalţi manageri mai întâi."
@@ -1047,8 +1003,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
 #~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să "
 #~ "închideţi ceilalţi manageri mai întâi."
@@ -1091,8 +1047,8 @@ msgstr ""
 #~ msgstr "Locaţiile au fost schimbate"
 
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
@@ -1106,13 +1062,13 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Actualizări disponibile</b></big>\n"
 #~ "\n"
-#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
-#~ "apăsând pe butonul Instalează."
+#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând "
+#~ "pe butonul Instalează."
 
 #~ msgid "0"
-#~ msgstr "0"
+#~ msgstr "0"
\ No newline at end of file
diff --git a/po/rw.po b/po/rw.po
index 32d4313c..c9257649 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,14 +15,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-31 20:55-0700\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-18 12:07+0000\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"ULL NAME <EMAIL@ADDRESS>\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:104
 #, python-format
@@ -34,31 +34,32 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 #, fuzzy
 msgid "Error importing selected file"
 msgstr "Kuzaza Byahiswemo IDOSIYE"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 #, fuzzy
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 #, fuzzy
 msgid "Error removing the key"
 msgstr "i Urufunguzo"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
+#: ../SoftwareProperties/SoftwareProperties.py:406
 #, fuzzy
-msgid "The key you selected could not be removed. Please report this as a bug."
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -66,11 +67,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -92,7 +93,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -102,38 +102,36 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-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:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
+msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -146,7 +144,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -194,208 +191,182 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Muyobozi ni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Byarangiye"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Amahinduka"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
-msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sisitemu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<B B"
+msgstr ""
 
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "Kwinjiza porogaramu"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Byarangiye"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -403,11 +374,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -427,8 +397,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -441,52 +411,38 @@ msgid "Details"
 msgstr "<B B"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-# sfx2/sdi\sfxslots.src:SID_RELOAD.text
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Kongera Gutangiza"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Byarangiye"
@@ -515,71 +471,64 @@ msgstr ""
 msgid "Cancel _Download"
 msgstr ""
 
-# officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Revision.Color.Change.text
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Amahinduka"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Isobanuramiterere"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
-msgstr "Ibihuzagihe bya porogaramumudasobwa "
+msgstr "Ibihuzagihe bya porogaramumudasobwa"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 #, fuzzy
 msgid "U_pgrade"
 msgstr "Byarangiye"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Kwinjiza porogaramu"
@@ -650,7 +599,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -659,7 +608,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -683,12 +632,12 @@ msgstr "<B B"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
 #, fuzzy
-msgid "<b>Components:</b>"
+msgid "<b>Distribution:</b>"
 msgstr "<B B"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
 #, fuzzy
-msgid "<b>Distribution:</b>"
+msgid "<b>Sections:</b>"
 msgstr "<B B"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
@@ -709,8 +658,8 @@ msgstr "<B B"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -745,14 +694,14 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 #, fuzzy
 msgid "_Custom"
 msgstr "Guhanga"
 
-# sfx2/sdi\sfxslots.src:SID_RELOAD.text
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 #, fuzzy
 msgid "_Reload"
@@ -795,130 +744,107 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "5"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "5"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 msgid "Officially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Restricted copyright"
 msgstr "Uburenganzira bw'umuhimbyi"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 #, fuzzy
 msgid "Non-free (Multiverse)"
 msgstr "Kigenga"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "4. 10"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
@@ -927,13 +853,9 @@ msgstr ""
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
 
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<B B"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
-#~ msgstr "Ibihuzagihe bya porogaramumudasobwa "
+#~ msgstr "Ibihuzagihe bya porogaramumudasobwa"
 
 #, fuzzy
 #~ msgid ""
@@ -980,10 +902,14 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto"
 
+#, fuzzy
+#~ msgid "<b>Components</b>"
+#~ msgstr "<B B"
+
 #, fuzzy
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<B B"
@@ -1003,14 +929,14 @@ msgstr ""
 #~ "You can add and remove authentication keys in this dialog. A key makes it "
 #~ "possible to verify the integrity of the software you download."
 #~ msgstr ""
-#~ "<B Utubuto B Kongeramo Na Gukuraho... Utubuto in iyi Ikiganiro A "
-#~ "Urufunguzo Kuri Kugenzura... i Bya i Gufungura"
+#~ "<B Utubuto B Kongeramo Na Gukuraho... Utubuto in iyi Ikiganiro A Urufunguzo "
+#~ "Kuri Kugenzura... i Bya i Gufungura"
 
 #, fuzzy
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr "a Gishya Urufunguzo IDOSIYE Kuri i i Urufunguzo KURI a Na i"
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
+#~ msgstr "a Gishya Urufunguzo IDOSIYE Kuri i i Urufunguzo KURI a Na i "
 
 #, fuzzy
 #~ msgid "Automatically clean _temporary packages files"
@@ -1018,7 +944,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Clean interval in days: "
-#~ msgstr "Intera in Iminsi"
+#~ msgstr "Intera in Iminsi "
 
 #, fuzzy
 #~ msgid "Delete _old packages in the package cache"
@@ -1034,8 +960,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "i Mburabuzi Utubuto Na: i Ikwirakwiza... OYA Guhindura>> Ukoresha: Utubuto"
 
@@ -1052,7 +978,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Update interval in days: "
-#~ msgstr "Intera in Iminsi"
+#~ msgstr "Intera in Iminsi "
 
 #, fuzzy
 #~ msgid ""
@@ -1068,15 +994,14 @@ msgstr ""
 #~ msgid ""
 #~ "This means that besides the actual upgrade of the packages some further "
 #~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
 #~ msgstr ""
 #~ "i Bya i Igikorwa Nka gukora iyinjizaporogaramu:%s Cyangwa ni Bya ngombwa "
 #~ "Gukoresha Cyangwa Kubona Kuri i"
 
 #, fuzzy
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "OYA"
+#~ msgstr "OYA "
 
 #, fuzzy
 #~ msgid "Changes not found, the server may not be updated yet."
@@ -1089,10 +1014,13 @@ msgstr ""
 #~ msgstr ""
 #~ "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
 
-# goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
 #, fuzzy
 #~ msgid "Version %s: \n"
-#~ msgstr "Verisiyo"
+#~ msgstr "Verisiyo \n"
+
+#, fuzzy
+#~ msgid "Downloading changes..."
+#~ msgstr "Amahinduka"
 
 #, fuzzy
 #~ msgid "The updates are being applied."
@@ -1100,8 +1028,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
 #~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira"
 
@@ -1128,11 +1056,11 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi "
-#~ "Ibyangombwa HTTP www org kugirango Ibisobanuro"
+#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi Ibyangombwa "
+#~ "HTTP www org kugirango Ibisobanuro"
 
 #, fuzzy
 #~ msgid "There is a new release of Ubuntu available!"
@@ -1140,8 +1068,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr "A Gishya Na: i ni Bihari HTTP www org kugirango Amabwiriza"
 
 #, fuzzy
@@ -1150,8 +1078,8 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
 #~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira"
 
@@ -1172,7 +1100,6 @@ msgstr ""
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PGM.FileFormat..0.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PPM.FileFormat..0.text
 #~ msgid "Binary"
 #~ msgstr "Nyabibiri"
 
@@ -1198,9 +1125,9 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
+#~ "The repository information has changes. A backup copy of your sources.list "
+#~ "is stored in %s.save. \n"
 #~ "\n"
 #~ "You need to reload the package list from the servers for your changes to "
 #~ "take effect. Do you want to do this now?"
-#~ msgstr "Kubika."
+#~ msgstr "Kubika."
\ No newline at end of file
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 00000000..a0b58669
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,807 @@
+# Slovak 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: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-26 01:43+0000\n"
+"Last-Translator: Martin Mancuska <borgcube@centrum.sk>\n"
+"Language-Team: Slovak <sk@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:104
+#, python-format
+msgid "Every %s days"
+msgstr "Každých %s dní"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+#, python-format
+msgid "After %s days"
+msgstr "Po %s dňoch"
+
+#: ../SoftwareProperties/SoftwareProperties.py:382
+msgid "Import key"
+msgstr "Importovať kľúč"
+
+#: ../SoftwareProperties/SoftwareProperties.py:392
+msgid "Error importing selected file"
+msgstr "Chyba pri importovaní vybraného súboru"
+
+#: ../SoftwareProperties/SoftwareProperties.py:393
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr "Vybraný súbor nemusí obsahovať GPG kľúč alebo môže byť poškodený."
+
+#: ../SoftwareProperties/SoftwareProperties.py:405
+msgid "Error removing the key"
+msgstr "Chyba pri odstraňovaní kľúča"
+
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
+msgstr "Vybraný kľúč nemohol byť odstránený. Prosím, nahláste to ako bug."
+
+#: ../SoftwareProperties/SoftwareProperties.py:447
+#, python-format
+msgid ""
+"<big><b>Error scaning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+"<big><b>Chyba pri načítavaní CD</b></big>\n"
+"\n"
+"%s"
+
+#: ../SoftwareProperties/SoftwareProperties.py:504
+msgid "Please enter a name for the disc"
+msgstr "Prosím, zadajte názov disku"
+
+#: ../SoftwareProperties/SoftwareProperties.py:520
+msgid "Please insert a disc in the drive:"
+msgstr "Prosím, vložte disk do mechaniky:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+msgid "Broken packages"
+msgstr "Poškodené balíčky"
+
+#: ../DistUpgrade/DistUpgradeCache.py:93
+msgid ""
+"Your system contains broken packages that couldn't be fixed with this "
+"software. Please fix them first using synaptic or apt-get before proceeding."
+msgstr ""
+"Váš systém obsahuje poškodené balíčky, ktoré nemôžu byť týmto programom "
+"opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get."
+
+#: ../DistUpgrade/DistUpgradeCache.py:135
+msgid "Can't upgrade required meta-packages"
+msgstr "Nemôžem upgradovať požadované meta-balíčky"
+
+#: ../DistUpgrade/DistUpgradeCache.py:142
+msgid "A essential package would have to be removed"
+msgstr "Základný balíček by musel byt odstránený"
+
+#: ../DistUpgrade/DistUpgradeCache.py:145
+msgid "Could not calculate the upgrade"
+msgstr "Nemôžem vypočítať upgrade"
+
+#: ../DistUpgrade/DistUpgradeCache.py:146
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"Počas počítania upgradu sa vyskytol neriešiteľný problém. Prosím, nahláste "
+"to ako bug. "
+
+#: ../DistUpgrade/DistUpgradeCache.py:168
+msgid "Error authenticating some packages"
+msgstr "Chyba pri overovaní niektorých balíčkov"
+
+#: ../DistUpgrade/DistUpgradeCache.py:169
+msgid ""
+"It was not possible to authenticate some packages. This may be a transient "
+"network problem. You may want to try again later. See below for a list of "
+"unauthenticated packages."
+msgstr ""
+"Nebolo možné overiť niektoré balíčky. Mohlo to byť spôsobené prechodným "
+"problémom v sieti. Môžete to skúsiť neskôr. Nižšie je uvedený zoznam "
+"neoverených balíčkov."
+
+#: ../DistUpgrade/DistUpgradeCache.py:232
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Nemôžem inštalovať '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:233
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"Nebolo možné nainštalovať požadovaný balíček. Prosím, nahláste to ako bug. "
+
+#: ../DistUpgrade/DistUpgradeCache.py:240
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:241
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:108
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:125
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:171
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:172
+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:191
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:192
+#, python-format
+msgid ""
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:198
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:214
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:215
+msgid ""
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:230
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:274
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:281
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:282
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:311
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:325
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:329
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:336
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:341
+msgid "System upgrade is complete."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#, python-format
+msgid "Downloading file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#, python-format
+msgid "Downloading file %li of %li at unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+msgid "The upgrade aborts now. Please report this bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+msgid ""
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#, python-format
+msgid "%s package is going to be removed."
+msgid_plural "%s packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
+#, python-format
+msgid "%s new package is going to be installed."
+msgid_plural "%s new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
+#, python-format
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+msgid "Could not find any upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+msgid "Your system has already been upgraded."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:68
+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)
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.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 ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Downloading and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../data/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 \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Check for available updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Show details"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:14
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:17
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:18
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:19
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid "     "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+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 ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Channel</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
+msgid "<b>Sections</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
+msgid "_Add Channel"
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
+msgid "_Custom"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+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 ""
+"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 ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:6
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:23
+msgid "Ubuntu 6.04 Security Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:40
+msgid "Ubuntu 6.04 Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:57
+msgid "Ubuntu 6.04 Backports"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:108
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:125
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:128
+msgid "Officially supported"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:131
+msgid "Restricted copyright"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:134
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#: ../channels/Ubuntu.info.in:137
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#: ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr ""
+
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
\ No newline at end of file
diff --git a/po/sv.po b/po/sv.po
index 132d0831..af2800c4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,120 +8,131 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-26 15:14+0100\n"
-"Last-Translator: Christian Rose <menthos@menthos.com>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-27 18:10+0000\n"
+"Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
 "Language-Team: Swedish <sv@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:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Var %s dag"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Efter %s dagar"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
-#, fuzzy
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr "Viktighet"
+msgstr "Importera nyckel"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
-msgstr ""
+msgstr "Fel vid import av vald fil"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
+"Den valda filen verkar inte vara en GPG-nyckel eller så är filen trasig."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
-msgstr ""
+msgstr "Fel vid borttagning av nyckeln"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+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 det som en bugg."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>Fel vid genomsökning av CD</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Skriv in namnet för skivan"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Sätt in en skiva i enheten:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
-#, fuzzy
 msgid "Broken packages"
-msgstr "paket"
+msgstr "Trasiga paket"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"Ditt system innehåller trasiga paket som inte kunde repareras med detta "
+"program. Var god använd synaptic eller apt-get för att reparera dem."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Kan inte uppdatera obligatoriska meta-paket"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Ett grundläggande paket skulle behövas tas bort"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Det gick inte beräkna uppdateringen"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
+"Ett problem som inte gick att lösa uppstod när uppdateringen kontrolerades. "
+"Rapportera gärna detta som en bugg. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Det gick inte att autentisiera vissa paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Det gick inte att autentisiera vissa paket. Det kan vara ett tillfälligt "
+"nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista "
+"med incke autentisierade paket."
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeCache.py:232
+#, python-format
 msgid "Can't install '%s'"
-msgstr "inte installerad"
+msgstr "Kan inte installera '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
+"Det var inte möjligt att installera ett obligatoriskt paket. Var god "
+"rapportera detta som en bugg. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Kan inte gissa meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -129,45 +140,55 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Ditt system innehåller inte ubuntu-desktop, kubuntu-desktop eller edubuntu-"
+"desktop och det var inte möjligt att upptäcka vilken version av ubuntu du "
+"använder.\n"
+" Var god installera ett av paketen ovan genom synaptic eller apt-get innan "
+"du fortsätter."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Läser cache"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Ingen giltig källa funnen"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
 msgstr ""
+"Ingen giltig källa för uppdatering hittades när dina förråd söktes igenom.\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Information om förråd ogiltig"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Uppdatering av informationen om förråd orsakade en ogiltig fil. Var god "
+"rabortera detta som en bug."
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
 msgid "Error during update"
-msgstr ""
+msgstr "Fel vid uppdatering"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Ett problem inträffade under uppdateringen. Detta beror oftast på någon form "
+"av nätverks problem, var god kontrolera din nätverks anslutning och försök "
+"igen."
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Inte tillräckligt med ledigt diskutrymme"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -176,227 +197,209 @@ msgid ""
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Uppdateringen avbryter nu. Vänligen frigör minst %s diskutrymme. Töm din "
+"papperskorg och ta bort temporära paket från tidigare uppdateringar genom "
+"att köra 'sudo apt-get clean'."
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
-#, fuzzy
 msgid "Do you want to start the upgrade?"
-msgstr "Vill du ändå installera detta paket?"
+msgstr "Vill du starta uppdateringen?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
-#, fuzzy
 msgid "Could not install the upgrades"
-msgstr "inte installerad"
+msgstr "Det gick inte att installera uppdateringarna"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Uppdateringen avbryter nu. Ditt system kan vara i ett instabilt läget. "
+"Vänligen försök med 'sudo apt-get install -f' eller Synaptic för att fixa "
+"systemet."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Det gick inte ladda ner uppdateringarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Uppdeateringen avbryter nu. Var god kontrollerar din internetanslutning "
+"eller installationsmedia och försök igen. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-#, fuzzy
-msgid "Remove obsolete packages?"
-msgstr " Ta bort paket "
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-#, fuzzy
-msgid "_Remove"
-msgstr "Ta bort"
+msgid "Remove obsolete Packages?"
+msgstr "Ta bort föråldrade paket?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "Fel inträffade vid utförandet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Ett fel inträffade vid upprensningen. Se meddelandet nedan för mer "
+"information. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "En annan pakethanterare körs"
+msgstr "Kontrolerar pakethanterare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Uppdaterar förrådsinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Ber om bekräftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "Uppgraderingar"
+msgstr "Uppdaterar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Söker efter föråldrad mjukvara"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Systemuppdateringarna är klara"
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Mata in \"%s\" i enheten \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr "Hämtning misslyckades"
+msgstr "Hämtningen är färdig"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Hämtar hem fil %li av %li med en hastighet av %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s återstår"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Hämtar hem fil %li av %li med en okänd hastighet"
 
 #. 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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "Hämtar ändringar..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "Installerar uppdateringar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#, python-format
 msgid "Could not install '%s'"
-msgstr "inte installerad"
+msgstr "Det gick inte installera \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
+msgstr "Uppdateringen avbryts. Var vänlig rapportera denna bugg."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Ett kritiskt fel uppstod"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Var vänlig rapportera detta som en bugg och inkludera ~/dist-upgrade.log och "
+"~/dist-upgrade-apt.log i din rapport. Uppdateringen avbryts. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s paket kommer att tas bort."
+msgstr[1] "%s paket kommer att tas bort."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s nytt paket kommer att installeras."
+msgstr[1] "%s nya paket kommer att installeras."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s packet kommer att uppgraderas."
+msgstr[1] "%s packet kommer att uppgraderas."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Du behöver ladda ner totalt %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
-msgstr ""
+msgstr "Uppdateringen kan ta flera timmar och kan inte avbrytas under tiden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"För att förhindra att data försvinner rekomenderas du att stänga alla "
+"program och dokument."
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr "inte installerad"
+msgstr "Kunde inte hitta några uppdateringar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "Ditt system har trasiga paket!"
+msgstr "Ditt system har redan uppdaterats."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Detaljer</b>"
+msgstr "<b>Tabort %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "Installera"
+msgstr "Installera %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "Uppgraderingar"
+msgstr "Uppdatera %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr "Krav"
+msgstr "Omstart krävs"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Uppdateringen är klar och datorn behöver startas om. Vill du göra det nu?"
 
 #. 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -405,80 +408,71 @@ 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"
+"\n"
+"Systemet kan bli instabilt om du avbryter uppdateringen. Du är strakt "
+"rekommderad att fortsätta uppdateringen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Starta om systemet för att färdigställa uppdateringen</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Starta uppdateringen?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Uppdaterar till Ubuntu \"Dapper\" "
+"6.04</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Rensar upp"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
 msgstr "Detaljer"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Hämtar och installerar uppdateringarna"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Ändra förråden för program"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr "Förbereder transaktion"
+msgstr "Förbereder uppdateringen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr "Uppdaterar system"
+msgstr "Startar om systemet"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Terminalfönster"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Läs om"
+msgstr "Uppdaterar Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Rapportera Bugg"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Starta om nu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "Uppgraderingar"
+msgstr "_Återuppta uppdateringen"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -487,6 +481,11 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Du måste kontrollera efter nya uppdateringar manuellt</big></b>\n"
+"\n"
+"Ditt system kontrollerar inte automatiskt efter uppdateringar . Du kan "
+"konfiguera detta beteende i \"System\" -> \"Administration\" -> "
+"\"Programvaruinställningar\""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -495,96 +494,90 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>Kontrollerar efter tillgängliga updateringar</b></big>\n"
+"\n"
+"Uppdateringar av mjukvara kan rätta fel, eliminera säkerhetshål, och "
+"tillhandahålla nya funktioner till dig."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Håll ditt system uppdaterat</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
-#, fuzzy
 msgid "Cancel _Download"
-msgstr "Hämta"
+msgstr "Avbryta _Nedladdning"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Ändringar"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "Kontrollera efter tillgängliga uppdateringar"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Utgåveanteckningar"
 
-#: ../data/UpdateManager.glade.h:14
-#, fuzzy
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr "Detaljer"
+msgstr "Visa detaljer"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Visa förlopp för enstaka filer"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Programvaruuppdateringar"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"Mjukvaruuppdateringar kan åtgärda fel, avlägsna säkerhetshål eller "
+"sårbarheter och förse programmet med nya funktioner."
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "Uppgraderingar"
+msgstr "_Uppdateringar"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Uppdatera till senaste versionen av Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "_Kontrollera"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Dölj denna information i framtiden"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "Letar efter uppdateringar..."
+msgstr "_Installera Uppdateringar"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "Kanaler"
+msgstr "<b>Kanaler</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-uppdateringar</b>"
+msgstr "<b>Internetuppdateringar</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
 msgstr "<b>Detaljer</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
-msgstr "Lägg till _cd"
+msgstr "Lägg till _CD"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -592,16 +585,15 @@ msgstr "Autentisering"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Tabort nerladdade programfiler:"
 
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
-msgstr ""
+msgstr "Importera den publika nyckeln för en betrod mjukvaruutgivare."
 
 #: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
 msgid "Installation Media"
-msgstr "Installationer"
+msgstr "Installationsmedia"
 
 #: ../data/SoftwareProperties.glade.h:9
 msgid "Internet Updates"
@@ -613,15 +605,17 @@ msgid ""
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
 msgstr ""
+"Endast säkerhetsuppdateringar från  officiela Ubuntu-servrar kommer att "
+"installeras automatiskt. Programpaketet \"unattended-upgrades\" behöver "
+"därför installeras"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Systemets standardalternativ"
+msgstr "_Återställ standardalternativ"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Återställ standardnycklar för din distribution"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -629,19 +623,19 @@ msgstr "Programvaruinställningar"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "Leta efter uppdateringar _automatiskt:"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "_Hämta uppdateringar i bakgrunden, men installera dom inte"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Installera säkerhetsuppdateringar utan bekräftelse"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -652,29 +646,32 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Kanalinformationen är föråldrad</big></b>\n"
+"\n"
+"Du behöver uppdatera kanalinformationen för att installera program och "
+"uppdateringar från nya och ändrade kanaler. \n"
+"\n"
+"Du behöver en internetanslutning som fungerar för att kunna fortsätta."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "Kanaler"
+msgstr "<b>Kanal</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Kommentar:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Komponenter</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Distribution:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Avdelningar:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
-msgstr "<b>Val</b>"
+msgstr "<b>Avdelningar:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
@@ -686,21 +683,25 @@ msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
+"<big><b>Skriv in en komplett APT-rad för kanalen du vill lägga "
+"till</b></big>\n"
+"\n"
+"APT-raden inehåller typ, plats och avdelningar för kanalen, till exempel "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT-rad:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "Add Channel"
-msgstr "Alla kanaler"
+msgstr "Lägg till kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -711,31 +712,30 @@ msgstr ""
 "Källkod"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
-#, fuzzy
 msgid "Edit Channel"
-msgstr "Kanal"
+msgstr "Redigera kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Söker igenom CD-skivan"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
-#, fuzzy
 msgid "_Add Channel"
-msgstr "Alla kanaler"
+msgid_plural "_Add Channels"
+msgstr[0] "_Läggtill kanal"
+msgstr[1] "_Läggtill kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "An_passad"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Läs om"
+msgstr "_Uppdatera"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Visa och installera tillgängliga uppdateringar"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -747,170 +747,132 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Om automatisk kontroll av uppdateringar är avaktiverad behöver du manuelt "
+"uppdatera kanallistan. Det här alternativet möjliggör att dölja påminelser "
+"som annars visas."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Påmin om att uppdatera kanallistan"
 
 #: ../data/update-manager.schemas.in.h:3
-#, fuzzy
 msgid "Show details of an update"
-msgstr "Detaljer"
+msgstr "Visa detaljer om en uppdatering"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Sparar storleken på uppdateringshanterarens fönster"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Sparar läget om extra information ska visas för ändringar och beskrivningar"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "Fönstrets storlek"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Brådskande uppdateringar"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Brådskande uppdateringar"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 Säkerhetsuppdateringar"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Brådskande uppdateringar"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 Uppdateringar"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Brådskande uppdateringar"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 Backåtanpassningar"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Brådskande uppdateringar"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Brådskande uppdateringar"
+msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Brådskande uppdateringar"
+msgstr "Ubuntu 5.10 Uppdateringar"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Brådskande uppdateringar"
+msgstr "Ubuntu 5.10 Bakåtanpassningar"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "Stöds officiellt"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
-msgstr "Begränsad copyright"
+msgstr "Begränsad upphovsrätt"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Gemenskapsunderhållen (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Ickefri (Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\" Säkerhetsuppdateringar"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testing)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (unstable)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "Stöds officiellt"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kompatibel mjukvara med beroenden till ickefri"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
-#, fuzzy
 msgid "Non-DFSG-compatible Software"
-msgstr "Tillgängliga program"
-
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Letar efter uppdateringar..."
+msgstr "Inte DFSG-kompatibel mjukvara"
 
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Läs om paketinformationen från servern."
 
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Val</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Programvaruuppdateringar"
@@ -926,8 +888,8 @@ msgstr "Tillgängliga program"
 #~ "Need to get the changes from the central server"
 #~ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Nätverksinställningar</span>\n"
-#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer "
-#~ "åt andra datorer"
+#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer åt "
+#~ "andra datorer"
 
 #~ msgid "Show available updates and choose which to install"
 #~ msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras"
@@ -965,6 +927,9 @@ msgstr "Tillgängliga program"
 #~ msgid "<b>Packages to install:</b>"
 #~ msgstr "<b>Paket att installera:</b>"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Komponenter</b>"
+
 #, fuzzy
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Säkerhet</b>"
@@ -1009,11 +974,10 @@ msgstr "Tillgängliga program"
 
 #, fuzzy
 #~ msgid "The following packages are not upgraded: "
-#~ msgstr "Följande kanaler är våra kanaltips!"
+#~ msgstr "Följande kanaler är våra kanaltips! "
 
 #~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än."
+#~ msgstr "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än."
 
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
@@ -1025,6 +989,9 @@ msgstr "Tillgängliga program"
 #~ msgid "Version %s: \n"
 #~ msgstr "Version %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Hämtar ändringar..."
+
 #~ msgid "The updates are being applied."
 #~ msgstr "Uppdateringarna verkställs."
 
@@ -1032,11 +999,11 @@ msgstr "Tillgängliga program"
 #~ msgstr "Uppgradering slutförd"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det "
-#~ "andra programmet först."
+#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det andra "
+#~ "programmet först."
 
 #, fuzzy
 #~ msgid "Updating package list..."
@@ -1067,11 +1034,11 @@ msgstr "Tillgängliga program"
 
 #, fuzzy
 #~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
+#~ "This usually means that another package management application (like apt-get "
+#~ "or aptitude) already running. Please close that application first"
 #~ msgstr ""
-#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det "
-#~ "andra programmet först."
+#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det andra "
+#~ "programmet först."
 
 #~ msgid "Initializing and getting list of updates..."
 #~ msgstr "Initierar och hämtar lista med uppdateringar..."
@@ -1237,18 +1204,16 @@ msgstr "Tillgängliga program"
 #~ "Försäkra dig om att du angav e-postadressen och aktiveringskoden korrekt"
 
 #~ msgid ""
-#~ "Unable to show help because the help files were missing.  Please report "
-#~ "this to your vendor."
+#~ "Unable to show help because the help files were missing.  Please report this "
+#~ "to your vendor."
 #~ msgstr ""
-#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till "
-#~ "din leverantör."
+#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till din "
+#~ "leverantör."
 
 #~ msgid ""
-#~ "Unable to show help because there are no applications available to view "
-#~ "help."
+#~ "Unable to show help because there are no applications available to view help."
 #~ msgstr ""
-#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är "
-#~ "tillgängliga."
+#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är tillgängliga."
 
 #~ msgid "Are you sure you want to open %d package information windows?"
 #~ msgstr "Är du säker på att du vill öppna %d fönster med paketinformation?"
@@ -1495,11 +1460,10 @@ msgstr "Tillgängliga program"
 #~ msgstr "Löser beroenden"
 
 #~ msgid ""
-#~ "You must agree to the licenses covering this software before installing "
-#~ "it."
+#~ "You must agree to the licenses covering this software before installing it."
 #~ msgstr ""
-#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan "
-#~ "du kan installera den."
+#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan du "
+#~ "kan installera den."
 
 #~ msgid "I Agree"
 #~ msgstr "Jag accepterar"
@@ -1700,7 +1664,6 @@ msgstr "Tillgängliga program"
 #~ msgstr "Hittade 1 matchande paket"
 
 # Patch = programfix enligt Datatermgruppen
-# http://www.nada.kth.se/dataterm/rek.html#a141
 #~ msgid "Found %d matching patches"
 #~ msgstr "Hittade %d matchande programfixar"
 
@@ -1752,7 +1715,6 @@ msgstr "Tillgängliga program"
 #~ msgid "Patches"
 #~ msgstr "Programfixar"
 
-# Osäker
 #~ msgid "YOU Patches"
 #~ msgstr "YOU-programfixar"
 
@@ -2009,8 +1971,8 @@ msgstr "Tillgängliga program"
 #~ msgstr "Kanalprenumerationer på kanal %s"
 
 #~ msgid ""
-#~ "You do not have permission to subscribe or unsubscribe from channels.  "
-#~ "You will be unable to make any changes to the subscriptions."
+#~ "You do not have permission to subscribe or unsubscribe from channels.  You "
+#~ "will be unable to make any changes to the subscriptions."
 #~ msgstr ""
 #~ "Du har inte rättighet att prenumerera eller säga upp prenumerationer på "
 #~ "kanaler. Du kommer inte att kunna göra ändringar i prenumerationer."
@@ -2031,8 +1993,8 @@ msgstr "Tillgängliga program"
 #~ msgstr "Privilegium"
 
 #~ msgid ""
-#~ "If you remove superuser privileges from yourself, you will be unable to "
-#~ "re-add them.\n"
+#~ "If you remove superuser privileges from yourself, you will be unable to re-"
+#~ "add them.\n"
 #~ "\n"
 #~ "Are you sure you want to do this?"
 #~ msgstr ""
@@ -2071,6 +2033,9 @@ msgstr "Tillgängliga program"
 #~ msgid "Are you sure you want to delete '%s'?"
 #~ msgstr "Är du säker på att du vill ta bort \"%s\"?"
 
+#~ msgid "Remove"
+#~ msgstr "Ta bort"
+
 #~ msgid "Privileges"
 #~ msgstr "Privilegier"
 
@@ -2154,8 +2119,8 @@ msgstr "Tillgängliga program"
 #~ msgstr "Information"
 
 #~ msgid ""
-#~ "Unable to show help because it was not found or because you don't have "
-#~ "any help viewers available."
+#~ "Unable to show help because it was not found or because you don't have any "
+#~ "help viewers available."
 #~ msgstr ""
 #~ "Kan inte visa hjälp eftersom den inte hittades eller eftersom du inte har "
 #~ "några hjälpvisare tillgängliga."
@@ -2265,10 +2230,8 @@ msgstr "Tillgängliga program"
 #~ msgid "Executive Summary"
 #~ msgstr "Sammanfattning"
 
-#~ msgid ""
-#~ "Update packages individually (NOTE: This is an unsupported operation)"
-#~ msgstr ""
-#~ "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)"
+#~ msgid "Update packages individually (NOTE: This is an unsupported operation)"
+#~ msgstr "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)"
 
 #~ msgid "Actual widget tag"
 #~ msgstr "Riktig widgettagg"
@@ -2412,8 +2375,7 @@ msgstr "Tillgängliga program"
 #~ msgstr "Städar upp..."
 
 #~ msgid ""
-#~ "The packages you requested are being downloaded and installed on your "
-#~ "system."
+#~ "The packages you requested are being downloaded and installed on your system."
 #~ msgstr ""
 #~ "Paketen du begärde håller på att hämtas och installeras på ditt system."
 
@@ -2519,9 +2481,9 @@ msgstr "Tillgängliga program"
 #~ "packages. You must free up some disk space before you can continue. Some "
 #~ "options include:"
 #~ msgstr ""
-#~ "<!--html-->Du har inte tillräckligt med diskutrymme för att kunna hämta "
-#~ "de begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. "
-#~ "Det finns en del alternativ:"
+#~ "<!--html-->Du har inte tillräckligt med diskutrymme för att kunna hämta de "
+#~ "begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. Det "
+#~ "finns en del alternativ:"
 
 #~ msgid "<!--html-->Removing some packages from your system"
 #~ msgstr "<!--html-->Tar bort en del paket från ditt system"
@@ -2533,14 +2495,13 @@ msgstr "Tillgängliga program"
 #~ msgstr "<a href=\"updater:cache_clear\">Töm din cache</a>."
 
 #~ msgid ""
-#~ "<font color=#ff0000>Warning!</font> There may not be sufficient disk "
-#~ "space to install this package, and installation of this package may fail. "
-#~ "You should free up some disk space before continuing."
+#~ "<font color=#ff0000>Warning!</font> There may not be sufficient disk space "
+#~ "to install this package, and installation of this package may fail. You "
+#~ "should free up some disk space before continuing."
 #~ msgstr ""
 #~ "<font color=#ff0000>Varning!</font> Det kan finnas otillräckligt med "
-#~ "diskutrymme för att installera detta paket, och installation av detta "
-#~ "paket kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du "
-#~ "fortsätter."
+#~ "diskutrymme för att installera detta paket, och installation av detta paket "
+#~ "kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du fortsätter."
 
 #~ msgid "1&nbsp;Package"
 #~ msgstr "1&nbsp;paket"
@@ -2551,34 +2512,31 @@ msgstr "Tillgängliga program"
 #~ msgid "<td width=25%>Old Version</td>"
 #~ msgstr "<td width=25%>Gammal version</td>"
 
-# Här kommer en siffra framför
 #~ msgid "Necessary Removals"
 #~ msgstr "nödvändiga borttagningar"
 
-# Här kommer en siffra framför
 #~ msgid "Necessary Installations"
 #~ msgstr "nödvändiga installationer"
 
 #~ msgid "<html><body><b>Please wait, loading page...</b></body></html>"
-#~ msgstr ""
-#~ "<html><body><b>Var vänlig vänta, läser in sidan...</b></body></html>"
+#~ msgstr "<html><body><b>Var vänlig vänta, läser in sidan...</b></body></html>"
 
 #~ msgid ""
 #~ "You have no packages from this channel currently installed on your system."
 #~ msgstr ""
-#~ "Du har för närvarande inte några paket från denna kanal installerade på "
-#~ "ditt system."
+#~ "Du har för närvarande inte några paket från denna kanal installerade på ditt "
+#~ "system."
 
 #~ msgid ""
-#~ "You can visit the channel's <a href=\"updater:info_page\">about page</a> "
-#~ "to get more information about what software is available, or you can go "
+#~ "You can visit the channel's <a href=\"updater:info_page\">about page</a> to "
+#~ "get more information about what software is available, or you can go "
 #~ "directly to the <a href=\"updater:available_page\">install page</a> to "
 #~ "install software."
 #~ msgstr ""
-#~ "Du kan besöka kanalens <a href=\"updater:info_page\">om-sida</a> för att "
-#~ "få mer information om vilken programvara som är tillgänglig, eller gå "
-#~ "direkt till <a href=\"updater:available_page\">installationssidan</a> för "
-#~ "att installera program."
+#~ "Du kan besöka kanalens <a href=\"updater:info_page\">om-sida</a> för att få "
+#~ "mer information om vilken programvara som är tillgänglig, eller gå direkt "
+#~ "till <a href=\"updater:available_page\">installationssidan</a> för att "
+#~ "installera program."
 
 #~ msgid "View the <a href=\"updater:info_page\">about page</a>."
 #~ msgstr "Visa <a href=\"updater:info_page\">om-sidan</a>."
@@ -2590,8 +2548,8 @@ msgstr "Tillgängliga program"
 #~ msgstr "Gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a>."
 
 #~ msgid ""
-#~ "You don't have any packages installed from this channel. The following "
-#~ "pre-defined sets of packages are available, or you may select individual "
+#~ "You don't have any packages installed from this channel. The following pre-"
+#~ "defined sets of packages are available, or you may select individual "
 #~ "packages from the <a href=updater:available_page>Install page</a>."
 #~ msgstr ""
 #~ "Du har inga paket installerade från denna kanal. Följande fördefinierade "
@@ -2602,37 +2560,37 @@ msgstr "Tillgängliga program"
 #~ msgstr "All programvara från denna kanal är aktuell."
 
 #~ msgid ""
-#~ "To install new software from this channel, visit the <a href=\"updater:"
-#~ "available_page\">install page</a>."
+#~ "To install new software from this channel, visit the <a "
+#~ "href=\"updater:available_page\">install page</a>."
 #~ msgstr ""
-#~ "För att installera ny programvara går du till <a href=\"updater:"
-#~ "available_page\">installationssidan</a>."
+#~ "För att installera ny programvara går du till <a "
+#~ "href=\"updater:available_page\">installationssidan</a>."
 
 #~ msgid ""
-#~ "To remove already installed software from this channel, visit the <a href="
-#~ "\"updater:installed_page\">remove page</a>."
+#~ "To remove already installed software from this channel, visit the <a "
+#~ "href=\"updater:installed_page\">remove page</a>."
 #~ msgstr ""
-#~ "För att ta bort redan installerad programvara från denna kanal går du "
-#~ "till <a href=\"updater:installed_page\">borttagningssidan</a>."
+#~ "För att ta bort redan installerad programvara från denna kanal går du till "
+#~ "<a href=\"updater:installed_page\">borttagningssidan</a>."
 
 #~ msgid "<a href=\"updater:unsubscribe\">Unsubscribe</a> from this channel."
 #~ msgstr ""
-#~ "<a href=\"updater:unsubscribed_page\">Säg upp prenumerationen</a> på "
-#~ "denna kanal."
+#~ "<a href=\"updater:unsubscribed_page\">Säg upp prenumerationen</a> på denna "
+#~ "kanal."
 
 #~ msgid ""
-#~ "There is <b>1 update</b> available in this channel, totalling <b>%s</b> "
-#~ "of data to be downloaded."
+#~ "There is <b>1 update</b> available in this channel, totalling <b>%s</b> of "
+#~ "data to be downloaded."
 #~ msgstr ""
 #~ "Det finns <b>1 uppdatering</b> tillgänglig i denna kanal, som kräver att "
 #~ "<b>%s</b> data hämtas."
 
 #~ msgid ""
-#~ "There are <b>%s updates</b> available in this channel, totalling <b>%s</"
-#~ "b> of data to be downloaded."
+#~ "There are <b>%s updates</b> available in this channel, totalling <b>%s</b> "
+#~ "of data to be downloaded."
 #~ msgstr ""
-#~ "Det finns <b>%s uppdateringar</b> tillgängliga i denna kanal, som kräver "
-#~ "att <b>%s</b> data hämtas."
+#~ "Det finns <b>%s uppdateringar</b> tillgängliga i denna kanal, som kräver att "
+#~ "<b>%s</b> data hämtas."
 
 #~ msgid "Essential Updates"
 #~ msgstr "Nödvändiga uppdateringar"
@@ -2664,36 +2622,34 @@ msgstr "Tillgängliga program"
 #~ "ditt system.</p>"
 
 #~ msgid ""
-#~ "<p>You can go to the <a href=\"updater:update_page\">Update page</a> to "
-#~ "view available updates for your software in this channel, or return to "
-#~ "the <a href=\"updater:summary\">Summary</a> to view all available updates."
-#~ "</p>"
+#~ "<p>You can go to the <a href=\"updater:update_page\">Update page</a> to view "
+#~ "available updates for your software in this channel, or return to the <a "
+#~ "href=\"updater:summary\">Summary</a> to view all available updates.</p>"
 #~ msgstr ""
-#~ "<p>Du kan gå till <a href=\"updater:update_page\">uppdateringssidan</a> "
-#~ "för att se de uppdateringar till din programvara som finns i denna kanal, "
-#~ "eller gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a> "
-#~ "för att se alla tillgängliga uppdateringar.</p>"
+#~ "<p>Du kan gå till <a href=\"updater:update_page\">uppdateringssidan</a> för "
+#~ "att se de uppdateringar till din programvara som finns i denna kanal, eller "
+#~ "gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a> för att se "
+#~ "alla tillgängliga uppdateringar.</p>"
 
 #~ msgid ""
 #~ "<p>You can go to the <a href=\"updater:summary\">Summary</a> to view all "
 #~ "available updates for your system.</p>"
 #~ msgstr ""
-#~ "<p>Du kan gå till <a href=\"updater:summary\">sammanfattningen</a> för "
-#~ "att se alla uppdateringar som är tillgängliga för ditt system.</p>"
+#~ "<p>Du kan gå till <a href=\"updater:summary\">sammanfattningen</a> för att "
+#~ "se alla uppdateringar som är tillgängliga för ditt system.</p>"
 
 #~ msgid ""
 #~ "<!--html-->The following packages from this channel are available for "
 #~ "installation."
 #~ msgstr ""
-#~ "<!--html-->Följande paket från denna kanal är tillgängliga för "
-#~ "installation."
+#~ "<!--html-->Följande paket från denna kanal är tillgängliga för installation."
 
 #~ msgid ""
-#~ " Package names that are in <font color=\"#777777\">gray</font> indicate "
-#~ "that a newer version of this package is already installed."
+#~ " Package names that are in <font color=\"#777777\">gray</font> indicate that "
+#~ "a newer version of this package is already installed."
 #~ msgstr ""
-#~ " Paketnamn som är <font color=\"#777777\">grå</font> indikerar att en "
-#~ "nyare version av detta paket redan är installerat."
+#~ " Paketnamn som är <font color=\"#777777\">grå</font> indikerar att en nyare "
+#~ "version av detta paket redan är installerat."
 
 #~ msgid "Name:"
 #~ msgstr "Namn:"
@@ -2735,18 +2691,18 @@ msgstr "Tillgängliga program"
 #~ msgstr "Du prenumererar för närvarande på alla tillgängliga kanaler!"
 
 #~ msgid ""
-#~ "There is <b>one update</b> available for your system, totalling <b>%s</b> "
-#~ "of data to be downloaded."
+#~ "There is <b>one update</b> available for your system, totalling <b>%s</b> of "
+#~ "data to be downloaded."
 #~ msgstr ""
-#~ "Det finns <b>en uppdatering</b> tillgänglig för ditt system, som kräver "
-#~ "att <b>%s</b> data hämtas."
+#~ "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."
+#~ "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."
+#~ "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>."
@@ -2764,8 +2720,7 @@ msgstr "Tillgängliga program"
 #~ msgstr "Synlig felsökningsnivå, går från 0 (ingenting) till 6 (allting)"
 
 #~ msgid "Log file debugging level, ranges from 0 (nothing) to 6 (everything)"
-#~ msgstr ""
-#~ "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)"
+#~ msgstr "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)"
 
 #~ msgid "The XAuthority file (usually from GDM)"
 #~ msgstr "XAuthority-filen (vanligtvis från GDM)"
@@ -2787,11 +2742,11 @@ msgstr "Tillgängliga program"
 #~ msgstr "Hämtar kanalgrafik..."
 
 #~ msgid ""
-#~ "An error occurred trying to parse the channel list. You should ensure "
-#~ "that you are running a supported distribution and try again later."
+#~ "An error occurred trying to parse the channel list. You should ensure that "
+#~ "you are running a supported distribution and try again later."
 #~ msgstr ""
-#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig "
-#~ "om att du använder en distribution som stöds och försöka igen senare."
+#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig om "
+#~ "att du använder en distribution som stöds och försöka igen senare."
 
 #~ msgid "Navigation"
 #~ msgstr "Navigering"
@@ -2956,7 +2911,6 @@ msgstr "Tillgängliga program"
 #~ msgid "<b>%d</b> %s"
 #~ msgstr "<b>%d</b> %s"
 
-# Här kommer en siffra framför
 #~ msgid "Requested Packages"
 #~ msgstr "begärda paket"
 
@@ -2998,4 +2952,4 @@ msgstr "Tillgängliga program"
 #~ msgid "translator-credits"
 #~ msgstr ""
 #~ "Christian Rose\n"
-#~ "Skicka synpunkter på översättningen till sv@li.org"
+#~ "Skicka synpunkter på översättningen till sv@li.org"
\ No newline at end of file
diff --git a/po/uk.po b/po/uk.po
index e49f9086..8d118735 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,51 +1,52 @@
-# Ukrainian translation of update-manager.  
-# Copyright (C) 2005 Free Software Foundation, Inc.  
-# Maxim Dziumanenko <mvd@mylinux.ua>, 2005  
+# Ukrainian translation of update-manager.
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Maxim Dziumanenko <mvd@mylinux.ua>, 2005
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-08-08 11:46+0300\n"
-"Last-Translator: Maxim Dziumanenko <mvd@mylinux.ua>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 11:26+0000\n"
+"Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\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"
+"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:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Кожні %s днів"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Через %s днів"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "Імпортувати ключ"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Помилка імпорту вибраного файлу"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Помилка видалення ключа"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,74 +54,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Введіть назву диску"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Вставте диск в пристрій:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Пошкоджені пакунки"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 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:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Не можливо поновити необхідні meta-пакунки"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Це призведе довидалення базового пакунку системи"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Не можливо розрахувати поновлення"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 #, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
+msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Помилка підписів в деяких пакунках"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Не можливо встановити '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
+msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Не можливо підібрати meta-пакунок"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -131,12 +131,11 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Зчитування кешу"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "Не знайдено"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
@@ -146,7 +145,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Помилка в даних про репозиторій"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
@@ -157,7 +156,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeControler.py:171
 #, fuzzy
 msgid "Error during update"
-msgstr "Помилка видалення ключа"
+msgstr "Помилка підчас поновлення"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
@@ -167,7 +166,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Недостатньо місця на диску"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -179,220 +178,210 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Бажаєте почати апгрейд системи?"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Неможливо провести апргрейд системи"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
+"Апргрейд системи щойно зупинено. Система тепер може працювати нестабільно. "
+"Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою "
+"Synaptic для налаштування системи."
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Неможливо завантажити пакунки для апргрейду системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з "
+"інтернетом чи носії та спробуйте знов. "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "Видалити непотрібні пакунки?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"При очищенні системи виникли проблеми. Прочитайте детальнішу інформацію "
+"нижче. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "Вже активний інший менеджер пакетів"
+msgstr "Перевірка програми управління пакунками"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "Отримання інформації про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Запит підтвердження"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Оновлення завершено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Пошук програм, що не використовуються"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Апргрейд системи завершено."
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Вставте '%s' в пристрій '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "Завантадення пакунків завершено"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Завантажується файл %li of %li at %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s залишилось"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "Завантажується файл %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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Завантаження змін..."
+msgid "Installing updates"
+msgstr "Встановлення оновлень..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Не можливо встановити '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Виникла невиправна помилка"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-"
+"upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
+msgstr[0] "%s пакунків буде видалено."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
+msgstr[0] "%s пакунків буде встановлено."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
+msgstr[0] "буде проведено апргрейд %s пакунків."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Потрібно завантажити всього %s пакунків."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"Апрейд може продовжуватись декілька годин, і не може бути перервано протягом "
+"всього часу."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Не знайдено пакунків для апгрейду"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "Апгрейд вашої системи вже проведено."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Клавіші</b>"
+msgstr "<b>Видалити %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Встановити"
+msgstr "Встановити %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Оновлення завершено"
+msgstr "Апргрейд %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "Необхідно перезавантажити систему"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -401,78 +390,66 @@ 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"
+"↵"
 
 #: ../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 ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Очищення"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
 msgstr "<b>Подробиці</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Завантаження та встановлення пакунків для апгрейду"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Підготовка до апгрейду системи"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "Перезавантаження системи"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "Термінал"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "Апгрейд системи Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Перезавантажити"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "П_овідомити про помилку"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Перезавантажити"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "П_родовжити апгрейд системи"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -496,64 +473,59 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Скасувати _Завантаження"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "Зміни"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
-#, fuzzy
 msgid "Check for available updates"
-msgstr "Перевірка оновлень ..."
+msgstr "Пошук пакунків для апгрейду"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Опис"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Оновлення програм"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Встановлення оновлень..."
@@ -625,7 +597,7 @@ msgid "_Check for updates automatically:"
 msgstr "Перевіряти оновлення кожні"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -634,7 +606,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -656,14 +628,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Компоненти</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Дистрибутив:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Розділи:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -680,14 +651,14 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></"
-"big>\n"
+"<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте "
+"додати</b></big>\n"
 "\n"
 "Рядок APT містить тип, адресу та вміст репозиторію, наприклад <i>\"deb "
 "http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у "
@@ -719,7 +690,10 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -767,145 +741,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Оновлення Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Оновлення безпеки Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Оновлення Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Оновлення Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Оновлення безпеки Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Оновлення Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Оновлення Ubuntu 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Офіціально підтримуються"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Обмежені авторські права"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Не-вільний (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Оновлення безпеки стабільного Debian"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Тестовий Debian"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian поза США (Нестабільний)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Офіціально підтримуються"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Встановлення оновлень..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Перезавантажити з сервера інформацію про пакет"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Розділи:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Оновлення програм"
@@ -942,6 +886,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "діб"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Компоненти</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Репозиторій</b>"
 
@@ -963,11 +910,11 @@ msgstr ""
 #~ "дає змогу перевірити цілісність завантаженого програмного забезпечення."
 
 #~ 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. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Додайте новий ключ до в'язки довірених ключів. Перевірте, що ви отримали "
-#~ "ключ безпечним каналом та ви довіряєте власнику."
+#~ "ключ безпечним каналом та ви довіряєте власнику. "
 
 #~ msgid "Add repository..."
 #~ msgstr "Додати репозиторій..."
@@ -979,7 +926,7 @@ msgstr ""
 #~ msgstr "Автоматично очищати _тимчасові файли пакетів"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "Інтервал очистки (днів):"
+#~ msgstr "Інтервал очистки (днів): "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "Видаляти _старі пакети з кешу пакетів"
@@ -988,14 +935,14 @@ msgstr ""
 #~ msgstr "Правка репозиторію..."
 
 #~ msgid "Maximum age in days:"
-#~ msgstr "Максимальний вік (днів): "
+#~ msgstr "Максимальний вік (днів):"
 
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Максимальний розмір (Мб):"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
 #~ "Відновити початкові ключі, що постачались з дистрибутивом. Встановлені "
 #~ "користувачем ключі не будуть змінені."
@@ -1013,7 +960,7 @@ msgstr ""
 #~ msgstr "Показувати вимкнені джерела програм"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "Інтервал оновлення (днів):"
+#~ msgstr "Інтервал оновлення (днів): "
 
 #~ msgid "_Add Repository"
 #~ msgstr "_Додати репозиторій"
@@ -1027,13 +974,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "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"
@@ -1120,6 +1067,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Версія %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Завантаження змін..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "Немає оновлених пакетів"
 
@@ -1136,8 +1086,7 @@ msgstr ""
 #~ msgstr[2] "Ви виділили %s пакетів оновлення, розмір %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ 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"
@@ -1146,11 +1095,11 @@ msgstr ""
 #~ msgstr "Застосовуються оновлення."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Одночасно можна запускати лише один менеджер пакетів. Спочатку закрийте "
-#~ "іншу програму.close this other application first."
+#~ "Одночасно можна запускати лише один менеджер пакетів. Спочатку закрийте іншу "
+#~ "програму.close this other application first."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Оновлення списку пакетів..."
@@ -1166,22 +1115,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "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"
+#~ "Поновіть систему на більш нову версію Ubuntu Linux. Для встановленої версії "
+#~ "не випускаються виправлення безпеки та інші критичні оновлення. Дивіться "
+#~ "інформацію про оновлення на http://www.ubuntulinux.org"
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Доступний новий випуск Ubuntu!"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "Доступний новий випуск з кодовою назвою '%s'. Інструкції оновлення "
-#~ "дивіться на http://www.ubuntulinux.org/"
+#~ "Доступний новий випуск з кодовою назвою '%s'. Інструкції оновлення дивіться "
+#~ "на http://www.ubuntulinux.org/"
 
 #~ msgid "Never show this message again"
 #~ msgstr "Не показуйте це повідомлення знову"
@@ -1193,4 +1142,4 @@ msgstr ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
 #~ msgstr ""
-#~ "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
+#~ "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
\ No newline at end of file
diff --git a/po/update-manager.pot b/po/update-manager.pot
index ae488ceb..e69de29b 100644
--- a/po/update-manager.pot
+++ b/po/update-manager.pot
@@ -1,853 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: ../SoftwareProperties/SoftwareProperties.py:104
-#, python-format
-msgid "Every %s days"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:134
-#, python-format
-msgid "After %s days"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:407
-msgid "Import key"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:417
-msgid "Error importing selected file"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:418
-msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:430
-msgid "Error removing the key"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:472
-#, python-format
-msgid ""
-"<big><b>Error scaning the CD</b></big>\n"
-"\n"
-"%s"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:529
-msgid "Please enter a name for the disc"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:545
-msgid "Please insert a disc in the drive:"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:92
-msgid "Broken packages"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:93
-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:135
-msgid "Can't upgrade required meta-packages"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:142
-msgid "A essential package would have to be removed"
-msgstr ""
-
-#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:145
-msgid "Could not calculate the upgrade"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:146
-msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
-msgstr ""
-
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
-msgid "Error authenticating some packages"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:170
-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:233
-#, python-format
-msgid "Can't install '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:234
-msgid ""
-"It was impossible to install a required package. Please report this as a "
-"bug. "
-msgstr ""
-
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
-msgid "Can't guess meta-package"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeCache.py:242
-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 ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:42
-msgid "Reading cache"
-msgstr ""
-
-#. FIXME: offer to write a new self.sources.list entry
-#: ../DistUpgrade/DistUpgradeControler.py:107
-msgid "No valid entry found"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:108
-msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:125
-msgid "Repository information invalid"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:126
-msgid ""
-"Upgrading the repository information resulted in a invalid file. Please "
-"report this as a bug."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:171
-msgid "Error during update"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:172
-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:191
-msgid "Not enough free disk space"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:192
-#, python-format
-msgid ""
-"The upgrade aborts now. Please free at least %s of disk space. Empty your "
-"trash and remove temporary packages of former installations using 'sudo apt-"
-"get clean'."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:198
-msgid "Do you want to start the upgrade?"
-msgstr ""
-
-#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:214
-msgid "Could not install the upgrades"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:215
-msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:231
-msgid "Could not download the upgrades"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:232
-msgid ""
-"The upgrade aborts now. Please check your internet connection or "
-"installation media and try again. "
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
-msgid "Error during commit"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:286
-msgid ""
-"Some problem occured during the clean-up. Please see the below message for "
-"more information. "
-msgstr ""
-
-#. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-msgid "Checking package manager"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:316
-msgid "Updating repository information"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:330
-msgid "Asking for confirmation"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:334
-msgid "Upgrading"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:341
-msgid "Searching for obsolete software"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:346
-msgid "System upgrade is complete."
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
-msgid "Download is complete"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#, python-format
-msgid "%s remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
-#, python-format
-msgid "Downloading file %li of %li at unknown speed"
-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:136
-msgid "Applying changes"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#, python-format
-msgid "Could not install '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
-msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
-msgid "A fatal error occured"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
-msgid ""
-"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
-"dist-upgrade-apt.log in your report. The upgrade aborts now. "
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
-#, python-format
-msgid "%s package is going to be removed."
-msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
-#, python-format
-msgid "%s new package is going to be installed."
-msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
-#, python-format
-msgid "%s package is going to be upgraded."
-msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
-msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
-msgid "To prevent data loss close all open applications and documents."
-msgstr ""
-
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
-msgid "Could not find any upgrades"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-msgid "Your system has already been upgraded."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, python-format
-msgid "<b>Remove %s</b>"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, python-format
-msgid "Install %s"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, python-format
-msgid "Upgrade %s"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeView.py:75
-msgid "Reboot required"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeView.py:76
-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/SoftwarePropertiesDialogs.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 ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
-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 "Downloading 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 "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Report Bug"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:20
-msgid "_Restart Now"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-msgid "_Resume Upgrade"
-msgstr ""
-
-#: ../data/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 \"System\" -> \"Administration\" -> \"Software Properties\"."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:4
-msgid ""
-"<big><b>Checking for available updates</b></big>\n"
-"\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:7
-msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:8
-msgid "Cancel _Download"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:9
-msgid "Changes"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
-msgid "Check for available updates"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:12
-msgid "Description"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:13
-msgid "Release Notes"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:14
-msgid "Show details"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:15
-msgid "Show progress of single files"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:16
-msgid "Software Updates"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:17
-msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:18
-msgid "U_pgrade"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:19
-msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:20
-msgid "_Check"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:21
-msgid "_Hide this information in the future"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:22
-msgid "_Install Updates"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Channels</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Internet updates</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-msgid "Internet Updates"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:2
-msgid "     "
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:3
-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 ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:8
-msgid "<b>Channel</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:9
-msgid "<b>Comment:</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:10
-msgid "<b>Components:</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
-msgid "<b>Distribution:</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:12
-msgid "<b>Sections</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:13
-msgid "<b>Type:</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:14
-msgid "<b>URI:</b>"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:15
-msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
-"\n"
-"The APT line contains the type, location and sections of a channel, for "
-"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:18
-msgid "APT line:"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:19
-msgid "Add Channel"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:20
-msgid ""
-"Binary\n"
-"Source"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:22
-msgid "Edit Channel"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:23
-msgid "Scanning CD-ROM"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:24
-msgid "_Add Channel"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:25
-msgid "_Custom"
-msgstr ""
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:26
-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 ""
-"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 ""
-
-#: ../data/update-manager.schemas.in.h:2
-msgid "Remind to reload the channel list"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:3
-msgid "Show details of an update"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:4
-msgid "Stores the size of the update-manager dialog"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:5
-msgid ""
-"Stores the state of the expander that contains the list of changs and the "
-"description"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:6
-msgid "The window size"
-msgstr ""
-
-#. ChangelogURI
-#: ../channels/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.06 Security Updates"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.06 Updates"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.06 Backports"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:108
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:125
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:128
-msgid "Officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:131
-msgid "Restricted copyright"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:134
-msgid "Community maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:137
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. ChangelogURI
-#: ../channels/Debian.info.in.h:4
-#, no-c-format
-msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../channels/Debian.info.in:6
-msgid "Debian 3.1 \"Sarge\""
-msgstr ""
-
-#. BaseURI
-#: ../channels/Debian.info.in:19
-msgid "http://security.debian.org/"
-msgstr ""
-
-#. Description
-#: ../channels/Debian.info.in:20
-msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
-
-#. Description
-#: ../channels/Debian.info.in:34
-msgid "Debian \"Etch\" (testing)"
-msgstr ""
-
-#. BaseURI
-#: ../channels/Debian.info.in:47
-msgid "http://http.us.debian.org/debian/"
-msgstr ""
-
-#. Description
-#: ../channels/Debian.info.in:48
-msgid "Debian \"Sid\" (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Debian.info.in:51
-msgid "Oficially supported"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Debian.info.in:54
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../channels/Debian.info.in:57
-msgid "Non-DFSG-compatible Software"
-msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 949875c2..3459aff4 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-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-08-26 18:15+0930\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:20+0000\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -26,27 +26,29 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "Gặp lỗi khi nhập tâp tin đã chọn"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng."
+msgstr ""
+"Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "Gặp lỗi khi gỡ bỏ khóa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -54,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -80,7 +82,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -90,38 +91,36 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. 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 "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:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, 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 "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: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -134,7 +133,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -182,200 +180,179 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Một bộ quản lý gói khác đang chạy"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "Nâng cấp xong"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "Đang tài về các thay đổi..."
+msgid "Installing updates"
+msgstr "Đang cài đặt bản cập nhật..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>Khóa</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "_Cài đặt"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "Nâng cấp xong"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -383,11 +360,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -407,8 +383,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -421,51 +397,38 @@ msgid "Details"
 msgstr "<b>Chi tiết</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "Tải lại"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -498,57 +461,53 @@ msgid "Changes"
 msgstr "Đổi"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "Đang kiểm tra có cập nhật..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Mô tả"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "Bản cập nhật phần mềm"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Đang cài đặt bản cập nhật..."
@@ -620,7 +579,7 @@ msgid "_Check for updates automatically:"
 msgstr "Kiểm tra có cập nhật sau mỗi"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -629,7 +588,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -651,14 +610,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Ghi chú :</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>Thành phần</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>Bản phát hành:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>Phần:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -670,13 +628,13 @@ msgstr "<b>Kiểu:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
-msgstr "<b>Địa chỉ định vị:</b> "
+msgstr "<b>Địa chỉ định vị:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -713,7 +671,8 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -761,145 +720,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.04"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "Bản quyền bị giới hạn"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 « Sarge »"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Bản cập nhật bảo mặt ổn định Debian"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Thử ra Debian"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Không Mỹ Debian (Bất định)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Đang cài đặt bản cập nhật..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "Tải lại thông tin gói từ máy phục vụ."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Phần:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Bản cập nhật phần mềm"
@@ -936,6 +865,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "ngày"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Thành phần</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>Kho</b>"
 
@@ -953,15 +885,15 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>Khóa xác thực</b></big>\n"
 #~ "\n"
-#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép "
-#~ "bạn thẩm tra toàn vẹn của phần mềm đã tải về."
+#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép bạn "
+#~ "thẩm tra toàn vẹn của phần mềm đã tải về."
 
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
 #~ msgstr ""
 #~ "Thêm tập tin khóa mới vào vòng khóa tin cây. Hãy đảm bảo bạn đã nhận khóa "
-#~ "này qua kênh bảo mật, và bạn tin cây người sở hữu khóa này."
+#~ "này qua kênh bảo mật, và bạn tin cây người sở hữu khóa này. "
 
 #~ msgid "Add repository..."
 #~ msgstr "Thêm kho..."
@@ -973,7 +905,7 @@ msgstr ""
 #~ msgstr "Tự động xóa tập tin gói _tạm thời"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "Thời gian giữa hai lần xóa, theo ngày:"
+#~ msgstr "Thời gian giữa hai lần xóa, theo ngày: "
 
 #~ msgid "Delete _old packages in the package cache"
 #~ msgstr "Xóa bỏ gói _cũ ra bộ nhớ tạm"
@@ -988,11 +920,11 @@ msgstr ""
 #~ msgstr "Cỡ tối đa, theo MB:"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr ""
-#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành "
-#~ "động này sẽ không sửa đổi khóa nào tự cài đặt."
+#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành động "
+#~ "này sẽ không sửa đổi khóa nào tự cài đặt."
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "Đặt cỡ tối _đa cho bộ nhớ tạm gói"
@@ -1021,13 +953,13 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "The following packages are found to be upgradable. You can upgrade them by "
+#~ "using the Install button."
 #~ msgstr ""
 #~ "<big><b>Bản nâng cấp công bố</b></big>\n"
 #~ "\n"
-#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn "
-#~ "giản hãy sử dụng nút « Cài đặt »."
+#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn giản "
+#~ "hãy sử dụng nút « Cài đặt »."
 
 #~ msgid "Cancel downloading the changelog"
 #~ msgstr "Thôi tải về Bản ghi đổi..."
@@ -1041,7 +973,6 @@ msgstr ""
 # #-#-#-#-#  compendium3.po (alleyoop HEAD)  #-#-#-#-#
 # #-#-#-#-#  vi.po (Gnome-icon-theme)  #-#-#-#-#
 # 48x48/emblems/emblem-bin.icon.in.h:1
-# 48x48/emblems/emblem-bin.icon.in.h:1
 #~ msgid "Binary"
 #~ msgstr "Nhị phân"
 
@@ -1102,6 +1033,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "Phiên bản %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "Đang tài về các thay đổi..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "Không có gói nào đã cập nhật."
 
@@ -1114,19 +1048,18 @@ msgstr ""
 #~ msgstr[0] "Bạn đã chọn tất cả %s gói đã cập nhật: cỡ tổng là %s"
 
 #~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
+#~ msgid_plural "You have selected %s out of %s updated packages, total size %s"
 #~ msgstr[0] "Bạn đã chọn %s trong %s gói đã cập nhật: cỡ tổng là %s"
 
 #~ msgid "The updates are being applied."
 #~ msgstr "Đang áp dụng những bản cập nhật."
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr ""
-#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. "
-#~ "Vui lòng đóng ứng dụng khác trước khi tiếp tục."
+#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. Vui "
+#~ "lòng đóng ứng dụng khác trước khi tiếp tục."
 
 #~ msgid "Updating package list..."
 #~ msgstr "Đạng cập nhật danh sách gói..."
@@ -1142,22 +1075,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "running will no longer get security fixes or other critical updates. Please "
+#~ "see http://www.ubuntulinux.org for upgrade information."
 #~ msgstr ""
-#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản "
-#~ "hiện thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem "
+#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản hiện "
+#~ "thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem "
 #~ "<http://www.ubuntulinux.org> để tìm thông tin nâng cấp."
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Có một bản phát hành Ubuntu mới công bố."
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "A new release with the codename '%s' is available. Please see "
+#~ "http://www.ubuntulinux.org/ for upgrade instructions."
 #~ msgstr ""
-#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem <http://www."
-#~ "ubuntulinux.org> để tìm hướng dẫn nâng cấp."
+#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem "
+#~ "<http://www.ubuntulinux.org> để tìm hướng dẫn nâng cấp."
 
 #~ msgid "Never show this message again"
 #~ msgstr "Đừng hiện thông điệp này lần nữa."
@@ -1169,5 +1102,5 @@ msgstr ""
 #~ "Failed to download changes. Please check if there is an active 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."
+#~ "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."
\ No newline at end of file
diff --git a/po/xh.po b/po/xh.po
index d88c6427..13febe9a 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-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-30 13:25+0200\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-18 12:11+0000\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -27,27 +27,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -55,11 +56,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -81,7 +82,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -92,35 +92,33 @@ msgid ""
 "this as a bug. "
 msgstr ""
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -133,7 +131,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -180,199 +177,179 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
-msgid "Applying changes"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+#, fuzzy
+msgid "Installing updates"
+msgstr "Seka zonke izihlaziyo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "Bonisa izihlaziyo"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -380,11 +357,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -404,8 +380,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -417,50 +393,38 @@ msgid "Details"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Replace"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -493,57 +457,53 @@ msgid "Changes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
 msgid "Software Updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Bonisa izihlaziyo"
@@ -612,7 +572,7 @@ msgid "_Check for updates automatically:"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -621,7 +581,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -644,12 +604,11 @@ msgid "<b>Comment:</b>"
 msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+msgid "<b>Distribution:</b>"
+msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-msgid "<b>Distribution:</b>"
+msgid "<b>Sections:</b>"
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
@@ -667,8 +626,8 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
@@ -698,7 +657,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -746,127 +707,100 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 msgid "Officially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
 msgstr ""
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 msgid "Oficially supported"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "Seka zonke izihlaziyo"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "Bonisa izihlaziyo"
@@ -907,8 +841,8 @@ msgstr ""
 #~ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Ulwazi oluhlaziyiweyo</span>\n"
 #~ "\n"
-#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda "
-#~ "funda olu lwazi lulandelayo ngocoselelo."
+#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda funda "
+#~ "olu lwazi lulandelayo ngocoselelo."
 
 #~ msgid "Run now"
-#~ msgstr "Phumeza inkqubo ngoku"
+#~ msgstr "Phumeza inkqubo ngoku"
\ No newline at end of file
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c49c8196..dadb16bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,118 +7,120 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-03-21 22:00+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-26 12:31+0000\n"
+"Last-Translator: firingstone <firingstone@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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:104
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "每%s天"
 
 #: ../SoftwareProperties/SoftwareProperties.py:134
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "%s天后"
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
-msgstr ""
+msgstr "导入密钥"
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
-msgstr ""
+msgstr "在导入所选文件时出错"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr ""
+msgstr "所选文件可能不是GPG密钥文件或者已经损坏."
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
-msgstr ""
+msgstr "删除密钥时候出错"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
+msgstr "你所选择的密钥不能被删除。请汇报这个bug"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
+"<big><b>读取光盘时出错</b></big>\n"
+"\n"
+"%s"
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "请输入光盘的名称"
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "请将光盘插入到光驱里:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "破损的软件包"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 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 ""
+msgstr "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者apt-get修复它们。"
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "不能升级要求的元包"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "一个必要的软件包会被删除"
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "无法计算升级"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr ""
+msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "在认证一些软件包时出错"
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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 ""
+msgstr "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软件包的列表。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "无法安装'%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr ""
+msgstr "无法安装要求的软件包。请汇报这个bug。 "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "无法猜出元包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -126,45 +128,46 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"你的系统没有一个ubuntu-desktop,kubuntu-desktop或eubuntu-"
+"desktop软件包所以无法确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中的一个。"
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "正在读取缓存"
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
-msgstr ""
+msgstr "未找到有效记录"
 
 #: ../DistUpgrade/DistUpgradeControler.py:108
 msgid ""
 "While scaning your repository information no valid entry for the upgrade was "
 "found.\n"
-msgstr ""
+msgstr "在检查你的源的信息时未能找到有效的升级记录\n"
 
 #: ../DistUpgrade/DistUpgradeControler.py:125
 msgid "Repository information invalid"
-msgstr ""
+msgstr "源的信息无效"
 
 #: ../DistUpgrade/DistUpgradeControler.py:126
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
-msgstr ""
+msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。"
 
 #: ../DistUpgrade/DistUpgradeControler.py:171
 msgid "Error during update"
-msgstr ""
+msgstr "升级时出错"
 
 #: ../DistUpgrade/DistUpgradeControler.py:172
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
-msgstr ""
+msgstr "升级时候出错。这通常是一些网络问题，请检查你的网络连接后再试。"
 
 #: ../DistUpgrade/DistUpgradeControler.py:191
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "磁盘空间不足"
 
 #: ../DistUpgrade/DistUpgradeControler.py:192
 #, python-format
@@ -172,221 +175,193 @@ msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
-msgstr ""
+msgstr "升级已被取消。请清理出至少%s的磁盘空间。清空你的回收站并通过'sudo apt-get clean'命令来删除之前安装的临时软件包。"
 
 #: ../DistUpgrade/DistUpgradeControler.py:198
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "你要开始升级么？"
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "无法安装升级"
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
-msgstr ""
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
+msgstr "升级现在取消。你的系统可能处于不稳定状态。请试着用'sudo apt-get install -f'或者新立得来修复你的系统。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "无法下载升级包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
-msgstr ""
+msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 "
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
+msgid "Remove obsolete Packages?"
+msgstr "删除陈旧的软件包？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
-msgstr ""
+msgstr "确认时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
-msgstr ""
+msgstr "在清理时发生问题。更多信息请查看以下消息。 "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 msgid "Checking package manager"
-msgstr "正在运行另外一个软件包管理器"
+msgstr "正在检查软件包管理器"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
-msgstr ""
+msgstr "更新源的信息"
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "请求确认"
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:329
 msgid "Upgrading"
-msgstr "更新已经完成"
+msgstr "正在更新"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "寻找陈旧的软件包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "系统更新完毕"
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "请将'%s'插入光驱'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
-msgstr ""
+msgstr "下载完成"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "正在下载文件%li来自%li速度是%s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "还剩%s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
-msgstr ""
+msgstr "正在下载文件%li来自%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:136
-#, fuzzy
-msgid "Applying changes"
-msgstr "正在下载更改..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid "Installing updates"
+msgstr "安装更新"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "无法安装'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
+msgstr "升级被取消。请报告这个bug。"
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
-msgstr ""
+msgstr "出现致命错误"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
+"请报告这个bug并在你的报告中包括这些文件~/dist-upgrade.log和~/dist-upgrade-apt.log。升级现在取消。 "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s软件包将被删除。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s新的软件包将被安装。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s软件包将被升级"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "你下载了总体的%s。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
-msgstr ""
+msgstr "升级会持续几个小时且不能在此后的任何时候被终止"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "关闭所有打开的程序和文档以防止数据丢失。"
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "不能找到任何升级"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
-msgstr "您的系统有损坏的软件包！"
+msgstr "你的系统已经升级。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>细节</b>"
+msgstr "<b>删除%s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
 msgid "Install %s"
-msgstr "安装(_I)"
+msgstr "安装%s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
 msgid "Upgrade %s"
-msgstr "更新已经完成"
+msgstr "升级%s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
-msgstr ""
+msgstr "需要重启"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 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):
 #. view.setStep(i+1)
-#. app.openCache()
 #: ../DistUpgrade/DistUpgrade.glade.h:1
 #: ../data/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -395,79 +370,67 @@ 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"
+"如果你取消升级系统可能不稳定。强烈建议你继续升级。"
 
 #: ../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 ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">升级到 Ubuntu \"Dapper\" 6.04</span>"
 
 #: ../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 ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "下载并安装升级"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "调整软件途径"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "正在准备升级"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
-msgstr ""
+msgstr "正在重启系统"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
-msgstr ""
+msgstr "终端"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "重新装入"
+msgstr "升级Ubuntu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
-msgstr ""
+msgstr "报告Bug(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
-msgstr ""
+msgstr "现在重启(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
-#, fuzzy
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
-msgstr "更新已经完成"
+msgstr "继续升级(_R)"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -476,6 +439,9 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>你必须手动检测升级</big></b>\n"
+"\n"
+"你的系统未自动检测升级。你可以通过编辑\"系统\" -> \"管理\" -> \"软件性能\"改变."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
@@ -484,115 +450,105 @@ msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
+"<big><b>正在检查有效的更新</b></big>\n"
+"\n"
+"软件更新可以为你修复错误，除去安全漏洞及提供新的特性。"
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>保持你的系统更新</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "取消下载(_D)"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
 msgstr "更改"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 msgid "Check for available updates"
-msgstr ""
+msgstr "检查有效的更新"
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "描述"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "发布说明"
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
-msgstr ""
+msgstr "显示详情"
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
-msgstr ""
+msgstr "显示单个文件进度"
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "软件更新"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
-msgstr ""
+msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性"
 
-#: ../data/UpdateManager.glade.h:18
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
-msgstr "更新已经完成"
+msgstr "升级(_p)"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "升级到最新版本的Ubuntu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
-msgstr ""
+msgstr "检查（_C）"
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "在以后隐藏该信息(_H)"
 
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
 msgid "_Install Updates"
-msgstr "安装(_I)"
+msgstr "安装更新(_I)"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>细节</b>"
+msgstr "<b>途径</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internet 更新</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
 msgid "<b>Keys</b>"
 msgstr "<b>细节</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "Add _Cdrom"
-msgstr "添加 CD(_C)"
+msgstr "添加 CDrom(_C)"
 
 #: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "Authentication"
 msgstr "身份验证(_U)"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "删除下载的软件文件(_e)"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
 msgstr "从信任的密钥环中删除选中的密钥。"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr ""
+msgstr "安装媒体"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
 msgstr "<b>Internet 更新</b>"
 
@@ -601,16 +557,15 @@ msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
 "automatically. The software package \"unattended-upgrades\" needs to be "
 "installed therefor"
-msgstr ""
+msgstr "只有来自官方Ubuntu服务器的安全更新才会被自动安装。为此，名为\"unattended-upgrades\"软件包需要被安装。"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "恢复默认密钥"
+msgstr "恢复默认值"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "将默认的密钥恢复到你的版本里"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -618,19 +573,19 @@ msgstr "软件首选项"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "自动检查更新(_C)"
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgid "_Download updates in the backgound, but do not install them"
+msgstr "在后台下载更新，但是不安装(_D)"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "不确认就安装安全更新(_I)"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -641,27 +596,27 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>频道信息已过时</big></b>\n"
+"你必须从新增加的或更新的频道重载频道信息以安装软件和更新。\n"
+"你需要一个有效的互联网连接才能继续。"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>细节</b>"
+msgstr "<b>途径</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>注释：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>组件</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>发行版：</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>节：</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
-#, fuzzy
 msgid "<b>Sections</b>"
 msgstr "<b>节：</b>"
 
@@ -675,12 +630,14 @@ msgstr "<b>URI：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
+"<big><b>输入你想增加的完整的频道 APT 命令行</b></big>\n"
+"APT 命令行包含频道的类型，位置和部分，例如：<i>\"deb http://ftp.debian.org sarge main\"</i>。"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -688,7 +645,7 @@ msgstr "APT 行："
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "添加通道"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -700,28 +657,28 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "编辑路径"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "正在扫描CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] "添加路径(_A)"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "自定义(_C)"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, 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"
@@ -732,165 +689,129 @@ 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 ""
+msgstr "如果自动检查更新被禁用，你将不得不手动重载频道列表。本选项允许隐藏此种情况下要出现的提醒语。"
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "提醒重载频道列表"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid "Show details of an update"
-msgstr ""
+msgstr "显示升级细节"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "储存更新管理器对话框的大小"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
-msgstr ""
+msgstr "储存包含变动和描述列表的扩展器的状态"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "The window size"
-msgstr ""
+msgstr "窗口大小"
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
+"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 安全更新"
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 'Dapper Drake'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 安全更新"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 6.04 安全更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.04 安全更新"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 6.04 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.04 安全更新"
+msgid "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.04 移植"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
-#, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 5.10 安全更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
-#, fuzzy
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 5.10 移植"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
-#, fuzzy
 msgid "Officially supported"
 msgstr "官方支持"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "版权限制"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr "社区维护"
+msgstr "社区维护(Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr "非自由"
+msgstr "非自由(Multiverse)"
 
-#. ChangelogURI
 #: ../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
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
-#. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian 稳定版安全更新"
+msgstr "Debian 3.1 \"Sarge\" 安全更新"
 
-#. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (测试)"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
-#. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (非稳定)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Oficially supported"
 msgstr "官方支持"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "带有非自由依赖关系的DFSG兼容软件"
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "非DFSG兼容软件"
 
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "从服务器重新装入软件包信息。"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>节：</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "软件更新"
@@ -918,6 +839,9 @@ msgstr ""
 #~ msgid "<b>Packages to install:</b>"
 #~ msgstr "要安装的软件包："
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>组件</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>仓库</b>"
 
@@ -934,7 +858,7 @@ msgstr ""
 #~ msgstr "自动清理临时包文件(_T)"
 
 #~ msgid "Clean interval in days: "
-#~ msgstr "清理间隔(以天计)："
+#~ msgstr "清理间隔(以天计)： "
 
 #~ msgid "Edit Repository..."
 #~ msgstr "编辑仓库..."
@@ -946,7 +870,7 @@ msgstr ""
 #~ msgstr "显示禁用的软件源"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "更新间隔(以天计)："
+#~ msgstr "更新间隔(以天计)： "
 
 #~ msgid "_Add Repository"
 #~ msgstr "添加仓库(_A)"
@@ -961,7 +885,10 @@ msgstr ""
 #~ msgstr "更改未找到，服务器可能尚未更新。"
 
 #~ msgid "Version %s: \n"
-#~ msgstr "版本 %s：\n"
+#~ msgstr "版本 %s： \n"
+
+#~ msgid "Downloading changes..."
+#~ msgstr "正在下载更改..."
 
 #~ msgid "The updates are being applied."
 #~ msgstr "更新已经应用。"
@@ -1028,4 +955,4 @@ msgstr ""
 #~ msgstr "美国限制出口的软件"
 
 #~ msgid "Repositories changed"
-#~ msgstr "仓库已变更"
+#~ msgstr "仓库已变更"
\ No newline at end of file
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ba134daa..9d70cc15 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-12-14 01:58+0800\n"
-"Last-Translator: Abel Cheung <abel@oaka.org>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:20+0000\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,27 +25,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "匯入指定檔案時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "移除密碼匙時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +54,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -79,7 +80,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -89,38 +89,36 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "你選定的密碼匙無法移除，請匯報問題。"
+msgstr "你選定的密碼匙無法移除，請匯報問題。 "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "你選定的密碼匙無法移除，請匯報問題。"
+msgstr "你選定的密碼匙無法移除，請匯報問題。 "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -133,7 +131,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -181,203 +178,182 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "另一個套件管理員正在執行中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "正在下載更改紀錄..."
+msgid "Installing updates"
+msgstr "正在安裝軟件更新..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>密碼匙</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "安裝(_I)"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "完成升級"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -385,11 +361,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -409,8 +384,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -423,51 +398,38 @@ msgid "Details"
 msgstr "<b>細節</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "重新載入"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -500,57 +462,53 @@ msgid "Changes"
 msgstr "更改紀錄"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "正在檢查更新套件..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "詳細說明"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "軟件更新"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "正在安裝軟件更新..."
@@ -622,7 +580,7 @@ msgid "_Check for updates automatically:"
 msgstr "檢查軟件更新間隔："
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -631,7 +589,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -653,14 +611,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>備註:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>元件</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>發行版本:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>分類:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -677,18 +634,17 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>請輸入整行你想加入的 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>。你可以在文件中尋找有關該行的格式的詳細描述。"
 
-# (Abel): 「APT 行」實在不倫不類
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT 軟件庫:"
@@ -715,7 +671,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -763,145 +721,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 5.04 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Ubuntu 5.04 安全性更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 更新"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "官方支援"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "版權受限"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "協力維護軟件 (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟件 (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 “Sarge”"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian 穩定版安全性更新"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian 測試版"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (不穩定版)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "官方支援"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "正在安裝軟件更新..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "由伺服器重新載入套件資料。"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>分類:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "軟件更新"
@@ -938,6 +866,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "日"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>元件</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>軟件庫</b>"
 
@@ -955,15 +886,12 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>認證用密碼匙</b></big>\n"
 #~ "\n"
-#~ "你可以在本對話窗內加減認證用的密碼匙。這些密碼匙可以用來檢查下載的軟件是否"
-#~ "完整。"
+#~ "你可以在本對話窗內加減認證用的密碼匙。這些密碼匙可以用來檢查下載的軟件是否完整。"
 
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "將新的密碼匙檔加入你信任的密碼匙圈之內。請確保該密碼匙是經安全的途徑獲得"
-#~ "的，而且屬於你信任的擁有者。"
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
+#~ msgstr "將新的密碼匙檔加入你信任的密碼匙圈之內。請確保該密碼匙是經安全的途徑獲得的，而且屬於你信任的擁有者。 "
 
 #~ msgid "Add repository..."
 #~ msgstr "加入軟件庫..."
@@ -990,10 +918,9 @@ msgstr ""
 #~ msgstr "大小上限 (MB):"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "將發行版本提供的預設密碼匙還原。這個程序不會更改用戶自行安裝的密碼匙。"
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
+#~ msgstr "將發行版本提供的預設密碼匙還原。這個程序不會更改用戶自行安裝的密碼匙。"
 
 #~ msgid "Set _maximum size for the package cache"
 #~ msgstr "指定套件快取的大小上限(_M)"
@@ -1008,7 +935,7 @@ msgstr ""
 #~ msgstr "顯示被停用的軟件來源"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "每隔多少天自動更新:"
+#~ msgstr "每隔多少天自動更新: "
 
 #~ msgid "_Add Repository"
 #~ msgstr "加入軟件庫(_A)"
@@ -1022,8 +949,8 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "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"
@@ -1098,6 +1025,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "版本 %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "正在下載更改紀錄..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "沒有任何套件需要更新"
 
@@ -1113,8 +1043,7 @@ 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"
+#~ 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"
 
@@ -1122,8 +1051,8 @@ msgstr ""
 #~ msgstr "現在安裝更新套件。"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr "你在任何時候只可以執行一個套件管理員程式。請關閉其它程式。"
 
 #~ msgid "Updating package list..."
@@ -1140,21 +1069,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "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 。"
+#~ "請升級至新版本的 Ubuntu Linux。你現在用的版本不會再有任何安全性更新或重要的更新。有關升級的資料，請瀏覽 "
+#~ "http://www.ubuntulinux.org 。"
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Ubuntu 已推出新版本！"
 
 #~ 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/ 獲取有關"
-#~ "升級的指引。"
+#~ "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 "Never show this message again"
 #~ msgstr "以後不再顯示此訊息"
@@ -1165,4 +1092,4 @@ msgstr ""
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
-#~ msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
+#~ msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
\ No newline at end of file
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f2a98b5e..eb026544 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-03-27 16:38+0200\n"
-"PO-Revision-Date: 2005-12-14 01:58+0800\n"
-"Last-Translator: Abel Cheung <abel@oaka.org>\n"
+"POT-Creation-Date: 2006-03-22 23:28+0000\n"
+"PO-Revision-Date: 2006-03-23 00:20+0000\n"
+"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,27 +25,28 @@ msgstr ""
 msgid "After %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:407
+#: ../SoftwareProperties/SoftwareProperties.py:382
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:417
+#: ../SoftwareProperties/SoftwareProperties.py:392
 msgid "Error importing selected file"
 msgstr "匯入指定檔案時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:418
+#: ../SoftwareProperties/SoftwareProperties.py:393
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:430
+#: ../SoftwareProperties/SoftwareProperties.py:405
 msgid "Error removing the key"
 msgstr "移除金鑰時發生錯誤"
 
-#: ../SoftwareProperties/SoftwareProperties.py:431
-msgid "The key you selected could not be removed. Please report this as a bug."
+#: ../SoftwareProperties/SoftwareProperties.py:406
+msgid ""
+"The key you selected could not be removed. Please report this as a bug."
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
-#: ../SoftwareProperties/SoftwareProperties.py:472
+#: ../SoftwareProperties/SoftwareProperties.py:447
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -53,11 +54,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:529
+#: ../SoftwareProperties/SoftwareProperties.py:504
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:545
+#: ../SoftwareProperties/SoftwareProperties.py:520
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
@@ -79,7 +80,6 @@ msgstr ""
 msgid "A essential package would have to be removed"
 msgstr ""
 
-#. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
 msgstr ""
@@ -89,38 +89,36 @@ msgstr ""
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "您選定的金鑰無法移除，請匯報問題。"
+msgstr "您選定的金鑰無法移除，請匯報問題。 "
 
-#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:169
+#: ../DistUpgrade/DistUpgradeCache.py:168
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:170
+#: ../DistUpgrade/DistUpgradeCache.py:169
 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:233
+#: ../DistUpgrade/DistUpgradeCache.py:232
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:234
+#: ../DistUpgrade/DistUpgradeCache.py:233
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "您選定的金鑰無法移除，請匯報問題。"
+msgstr "您選定的金鑰無法移除，請匯報問題。 "
 
-#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:241
+#: ../DistUpgrade/DistUpgradeCache.py:240
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:242
+#: ../DistUpgrade/DistUpgradeCache.py:241
 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 "
@@ -133,7 +131,6 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#. FIXME: offer to write a new self.sources.list entry
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "No valid entry found"
 msgstr ""
@@ -181,203 +178,182 @@ msgstr ""
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#. installing the packages failed, can't be retried
 #: ../DistUpgrade/DistUpgradeControler.py:214
 msgid "Could not install the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:215
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"is now run (dpkg --configure -a)."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:231
+#: ../DistUpgrade/DistUpgradeControler.py:230
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:232
+#: ../DistUpgrade/DistUpgradeControler.py:231
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:274
-msgid "Remove obsolete packages?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Skip This Step"
+msgid "Remove obsolete Packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:275
-msgid "_Remove"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeControler.py:285
+#: ../DistUpgrade/DistUpgradeControler.py:281
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:286
+#: ../DistUpgrade/DistUpgradeControler.py:282
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
-#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:300
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
 #, fuzzy
 msgid "Checking package manager"
 msgstr "另一個套件管理員正在執行中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:316
+#: ../DistUpgrade/DistUpgradeControler.py:311
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:330
+#: ../DistUpgrade/DistUpgradeControler.py:325
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:334
+#: ../DistUpgrade/DistUpgradeControler.py:329
 #, fuzzy
 msgid "Upgrading"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:341
 msgid "System upgrade is complete."
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
 #, python-format
 msgid "Downloading file %li of %li at unknown speed"
 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:136
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 #, fuzzy
-msgid "Applying changes"
-msgstr "正在下載更改紀錄..."
+msgid "Installing updates"
+msgstr "正在安裝軟體更新..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:150
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
-#. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, python-format
-msgid ""
-"Replace configuration file\n"
-"'%s'?"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:262
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:263
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
 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. "
+"Please report this as a bug and include the files ~/dist-upgrade.log and "
+"~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:352
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:364
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:375
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:378
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
-#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:384
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:385
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:400
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy
 msgid "<b>Remove %s</b>"
-msgstr "<b>金鑰</b>"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:402
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "Install %s"
-msgstr "安裝(_I)"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:404
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy
 msgid "Upgrade %s"
-msgstr "完成升級"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:67
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:68
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -385,11 +361,10 @@ 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/SoftwarePropertiesDialogs.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -409,8 +384,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
-"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
-"span>"
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" "
+"6.04</span>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -423,51 +398,38 @@ msgid "Details"
 msgstr "<b>細節</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
-msgid "Difference between the files"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Modifying the software channels"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Preparing the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:14
+#: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Restarting the system"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:15
+#: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Terminal"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:16
+#: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Upgrading Ubuntu"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Keep"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
-msgid "_Replace"
-msgstr "重新載入"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -500,57 +462,53 @@ msgid "Changes"
 msgstr "更改紀錄"
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Chec_k"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
 #, fuzzy
 msgid "Check for available updates"
 msgstr "正在檢查更新套件..."
 
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "詳細說明"
 
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:12
 msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:13
 msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:14
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:15
 msgid "Software Updates"
 msgstr "軟體更新"
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:16
 msgid ""
 "Software updates can correct errors, eliminate security vulnerabilities, and "
 "provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:17
 msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:18
 msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:19
 msgid "_Check"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:20
 msgid "_Hide this information in the future"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:21
 #, fuzzy
 msgid "_Install Updates"
 msgstr "正在安裝軟體更新..."
@@ -622,7 +580,7 @@ msgid "_Check for updates automatically:"
 msgstr "檢查軟體更新間隔："
 
 #: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the background, but do not install them"
+msgid "_Download updates in the backgound, but do not install them"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:16
@@ -631,7 +589,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
-msgstr ""
+msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
 msgid ""
@@ -653,14 +611,13 @@ msgid "<b>Comment:</b>"
 msgstr "<b>備註:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
-msgid "<b>Components:</b>"
-msgstr "<b>元件</b>"
-
-#: ../data/SoftwarePropertiesDialogs.glade.h:11
 msgid "<b>Distribution:</b>"
 msgstr "<b>發行版本:</b>"
 
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Sections:</b>"
+msgstr "<b>分類:</b>"
+
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 #, fuzzy
 msgid "<b>Sections</b>"
@@ -677,18 +634,17 @@ msgstr "<b>URI:</b>"
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 #, fuzzy
 msgid ""
-"<big><b>Enter the complete APT line of the channel that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the channel that you want to "
+"add</b></big>\n"
 "\n"
 "The APT line contains the type, location and sections of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>請輸入整行您想加入的 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>。您可以在文件中尋找有關該行的格式的詳細描述。"
 
-# (Abel): 「APT 行」實在不倫不類
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
 msgstr "APT 軟體庫:"
@@ -715,7 +671,9 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
-msgstr ""
+msgid_plural "_Add Channels"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
@@ -763,145 +721,115 @@ msgstr ""
 msgid "The window size"
 msgstr ""
 
-#. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Ubuntu.info.in:6
 #, fuzzy
-msgid "Ubuntu 6.06 'Dapper Drake'"
+msgid "Ubuntu 6.04 'Dapper Drake'"
 msgstr "Ubuntu 5.04 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:23
 #, fuzzy
-msgid "Ubuntu 6.06 Security Updates"
+msgid "Ubuntu 6.04 Security Updates"
 msgstr "Ubuntu 5.04 安全性更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:40
 #, fuzzy
-msgid "Ubuntu 6.06 Updates"
+msgid "Ubuntu 6.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:57
 #, fuzzy
-msgid "Ubuntu 6.06 Backports"
+msgid "Ubuntu 6.04 Backports"
 msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:74
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
 
-#. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
-#. Description
 #: ../channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 更新"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:128
 #, fuzzy
 msgid "Officially supported"
 msgstr "官方支援"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
 msgstr "版權受限"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
 msgstr "協力維護軟體 (Universe)"
 
-#. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟體 (Multiverse)"
 
-#. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
 msgstr "Debian 3.1 “Sarge”"
 
-#. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:20
 #, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian 穩定版安全性更新"
 
-#. Description
 #: ../channels/Debian.info.in:34
 #, fuzzy
 msgid "Debian \"Etch\" (testing)"
 msgstr "Debian 測試版"
 
-#. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
 msgstr ""
 
-#. Description
 #: ../channels/Debian.info.in:48
 #, fuzzy
 msgid "Debian \"Sid\" (unstable)"
 msgstr "Debian Non-US (不穩定版)"
 
-#. CompDescription
 #: ../channels/Debian.info.in:51
 #, fuzzy
 msgid "Oficially supported"
 msgstr "官方支援"
 
-#. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
-#. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Installing updates"
-#~ msgstr "正在安裝軟體更新..."
-
 #, fuzzy
 #~ msgid "Reload the latest information about updates"
 #~ msgstr "由伺服器重新載入套件資料。"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>分類:</b>"
-
 #, fuzzy
 #~ msgid "Add Software Channels"
 #~ msgstr "軟體更新"
@@ -938,6 +866,9 @@ msgstr ""
 #~ msgid "day(s)"
 #~ msgstr "日"
 
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>元件</b>"
+
 #~ msgid "<b>Repository</b>"
 #~ msgstr "<b>軟體庫</b>"
 
@@ -955,15 +886,12 @@ msgstr ""
 #~ msgstr ""
 #~ "<big><b>認證用金鑰</b></big>\n"
 #~ "\n"
-#~ "您可以在本對話窗內加減認證用的金鑰。這些金鑰可以用來檢查下載的軟體是否完"
-#~ "整。"
+#~ "您可以在本對話窗內加減認證用的金鑰。這些金鑰可以用來檢查下載的軟體是否完整。"
 
 #~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "將新的金鑰檔加入您信任的鑰匙圈之內。請確保該金鑰是經安全的途徑獲得的，而且"
-#~ "屬於您信任的擁有者。"
+#~ "Add a new key file to the trusted keyring. Make sure that you received the "
+#~ "key over a secure channel and that you trust the owner. "
+#~ msgstr "將新的金鑰檔加入您信任的鑰匙圈之內。請確保該金鑰是經安全的途徑獲得的，而且屬於您信任的擁有者。 "
 
 #~ msgid "Add repository..."
 #~ msgstr "加入軟體庫..."
@@ -990,8 +918,8 @@ msgstr ""
 #~ msgstr "大小上限 (MB):"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Restore the default keys shipped with the distribution. This will not change "
+#~ "user installed keys."
 #~ msgstr "將發行版本提供的預設金鑰還原。這個程序不會更改用戶自行安裝的金鑰。"
 
 #~ msgid "Set _maximum size for the package cache"
@@ -1007,7 +935,7 @@ msgstr ""
 #~ msgstr "顯示被停用的軟體來源"
 
 #~ msgid "Update interval in days: "
-#~ msgstr "每隔多少天自動更新:"
+#~ msgstr "每隔多少天自動更新: "
 
 #~ msgid "_Add Repository"
 #~ msgstr "加入軟體庫(_A)"
@@ -1021,8 +949,8 @@ msgstr ""
 #~ msgid ""
 #~ "<big><b>Available Updates</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "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"
@@ -1097,6 +1025,9 @@ msgstr ""
 #~ msgid "Version %s: \n"
 #~ msgstr "版本 %s: \n"
 
+#~ msgid "Downloading changes..."
+#~ msgstr "正在下載更改紀錄..."
+
 #~ msgid "There are no updated packages"
 #~ msgstr "沒有任何套件需要更新"
 
@@ -1112,8 +1043,7 @@ 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"
+#~ 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"
 
@@ -1121,8 +1051,8 @@ msgstr ""
 #~ msgstr "現在安裝更新套件。"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "You can run only one package management application at the same time. Please "
+#~ "close this other application first."
 #~ msgstr "您在任何時候只可以執行一個套件管理員程式。請關閉其它程式。"
 
 #~ msgid "Updating package list..."
@@ -1139,21 +1069,19 @@ msgstr ""
 
 #~ msgid ""
 #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ "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 。"
+#~ "請升級至新版本的 Ubuntu Linux。您現在用的版本不會再有任何安全性更新或重要的更新。有關升級的資訊，請瀏覽 "
+#~ "http://www.ubuntulinux.org 。"
 
 #~ msgid "There is a new release of Ubuntu available!"
 #~ msgstr "Ubuntu 已推出新版本！"
 
 #~ 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/ 獲取有關"
-#~ "升級的指引。"
+#~ "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 "Never show this message again"
 #~ msgstr "以後不再顯示此訊息"
@@ -1164,4 +1092,4 @@ msgstr ""
 #~ msgid ""
 #~ "Failed to download changes. Please check if there is an active internet "
 #~ "connection."
-#~ msgstr "無法下載更改紀錄。請檢查網路連線是否正常。"
+#~ msgstr "無法下載更改紀錄。請檢查網路連線是否正常。"
\ No newline at end of file
-- 
cgit v1.2.3


From c4020d3179f287120da0c566cbae3a6034946637 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 30 Mar 2006 01:43:14 +0200
Subject: * add a "no-pkg-state-changes" timeout/termianl expand into the code

---
 DistUpgrade/DistUpgradeViewGtk.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 4ce026c8..d8c55763 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -115,7 +115,10 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         return True
 
 class GtkInstallProgressAdapter(InstallProgress):
-
+    # timeout with no status change when the terminal is expanded
+    # automatically
+    TIMEOUT_TERMINAL_ACTIVITY = 120
+    
     def __init__(self,parent):
         InstallProgress.__init__(self)
         self.label_status = parent.label_status
@@ -145,7 +148,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         # do a bit of time-keeping
         self.start_time = 0.0
         self.time_ui = 0.0
-        self.longest_time_per_percent = 0.0
+        self.last_activity = 0.0
         
     def error(self, pkg, errormsg):
         logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg))
@@ -204,7 +207,8 @@ class GtkInstallProgressAdapter(InstallProgress):
         self.label_status.set_text(status.strip())
         # start showing when we gathered some data
         if percent > 1.0:
-          delta = time.time() - self.start_time
+          self.last_activity = time.time()
+          delta = self.last_activity - self.start_time
           time_per_percent = (float(delta)/percent)
           eta = (100.0 - self.percent) * time_per_percent
           # only show if we have some sensible data
@@ -231,6 +235,11 @@ class GtkInstallProgressAdapter(InstallProgress):
         if self.start_time == 0.0:
           self.progress.pulse()
           time.sleep(0.2)
+        # check about terminal activity
+        if self.last_activity > 0 and \
+           (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time():
+          logging.warning("no activity on terminal for %s seconds" % self.TIMEOUT_TERMINAL_ACTIVITY)
+          self.parent.expander_terminal.set_expanded(True)
         while gtk.events_pending():
             gtk.main_iteration()
 	time.sleep(0.02)
-- 
cgit v1.2.3