* DistUpgrade/Changelog, README, ReleaseAnnouncement

  - updated to reflect reality
* DistUpgrade/DistUpgradeControler.py:
  - set the permission for the apt.log file to 0644
* DistUpgrade/cdromupgrade:
  - updated and comments added
* po/*:
  - make update-po

63 files changed, 18707 insertions, 11012 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index b07e9721..bda1d3a8 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,12 +1,15 @@
+2006-08-30:
+	- fixes to the cdromupgrade wrapper
 2006-08-29:
 	- always enable the "main" component to make sure it is available
-	- add download estimate
+	- add download estimated time
 	- add --cdrom switch to make cdrom based dist-upgrades possible
 	- better error reporting
 	- moved the logging into the /var/log/dist-upgrade/ dir
 	- change the obsoletes calculation when run without network and
           consider demotions as obsoletes then (because we can't really
 	  use the "pkg.downloadable" hint without network)
+	- uploaded
 2006-08-18: 
 	- sort the demoted software list
 2006-07-31:
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 69d4cefe..38d3b73e 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -113,7 +113,7 @@ class DistUpgradeControler(object):
         # turn on debuging in the cache
         apt_pkg.Config.Set("Debug::pkgProblemResolver","true")
         fd = os.open("/var/log/dist-upgrade/apt.log",
-                     os.O_RDWR|os.O_CREAT|os.O_TRUNC)
+                     os.O_RDWR|os.O_CREAT|os.O_TRUNC, 0644)
         os.dup2(fd,1)
         os.dup2(fd,2)
 
diff --git a/DistUpgrade/README b/DistUpgrade/README
index d519ef11..9d408f43 100644
--- a/DistUpgrade/README
+++ b/DistUpgrade/README
@@ -5,8 +5,9 @@ The dist-upgrader is designed to make upgrades for ubuntu (or similar
 distributions) easy and painless. It supports both network mode and
 cdrom upgrades. The cdromupgrade will ask if it should use the network
 or not. There is a wrapper script "cdromugprade" (that assumes the
-file of the upgrade life in CDROM_ROOT/upgrade/) that can be put onto
-the CD and it will support upgrades directly from the CD.
+file of the upgrade life in
+CDROM_ROOT/dists/stable/dist-upgrader/binary-all/) that can be put
+onto the CD and it will support upgrades directly from the CD.
 
 
 Configuration
diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement
index 2d4e03a4..98eca455 100644
--- a/DistUpgrade/ReleaseAnnouncement
+++ b/DistUpgrade/ReleaseAnnouncement
@@ -8,17 +8,7 @@ The Ubuntu team is proud to announce Ubuntu 6.10 'Edgy Eft'.
 Ubuntu is a Linux distribution for your desktop or server, with a fast
 and easy install, regular releases, a tight selection of excellent
 applications installed by default, and almost any other software you
-can imagine available through the network. Ubuntu 6.06 LTS (Long Term
-Support) will be supported with security updates for 5 years on the
-server and 3 years on the desktop after its release, and professional
-technical support is available from many companies around the world.
-
-Visit https://wiki.ubuntu.com/DapperReleaseNotes for the latest
-information and frequently asked questions about the upgrade. 
-
-Please read these notes before, during, and after installation and
-configuration of Ubuntu 6.06 LTS, and before reporting bugs in
-https://launchpad.net/malone/distros/ubuntu
+can imagine available through the network. 
 
 We hope you enjoy Ubuntu.
 
diff --git a/DistUpgrade/cdromupgrade b/DistUpgrade/cdromupgrade
index d33c56c1..fcebe1c7 100755
--- a/DistUpgrade/cdromupgrade
+++ b/DistUpgrade/cdromupgrade
@@ -4,7 +4,16 @@
 # to make it possible to put it onto the top-level dir of a CD and
 # run it from there
 # 
+# Not that useful unfortunately when the CD is mounted "noexec",
+# but useful for the notification-daemon that will just run it
+# and be done with it
+#
+# WARNING: make sure to call it with a absolute path!
+#          (e.g. /cdrom/cdromugprade)
+
+UPGRADER_DIR=dists/stable/dist-upgrader/binary-all/
 
 cddirname=${0%\/*}
-cd $cddirname/upgrade
-$cddirname/upgrade/dist-upgrade.py --cdrom $cddirname
\ No newline at end of file
+fullpath=$cddirname/$UPGRADER_DIR
+cd $fullpath
+gksu -- python $fullpath/edgy --cdrom $cddirname
diff --git a/debian/changelog b/debian/changelog
index 3f60cb20..2ec2f121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+update-manager (0.44.5) edgy; urgency=low
+
+  * install the DistUpgrade package too
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Aug 2006 11:32:24 +0200
+
 update-manager (0.44.4) edgy; urgency=low
 
   * SoftwareProperties/SoftwareProperties.py:
diff --git a/po/ar.po b/po/ar.po
index e3b7a07d..14eea409 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:46+0000\n"
 "Last-Translator: Jadmadi <contact@jadmadi.net>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -134,64 +134,66 @@ msgstr "الرجاء ادخال اسم القرص"
 msgid "Please insert a disc in the drive:"
 msgstr "الرجاء ادخال القرص في الجهاز"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +202,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "قراءة من الكاش"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -221,11 +249,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -234,42 +262,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "importing"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "مصدر الطرف الثالث غير مفعل"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "خطاء خلال التحديث"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "لا يوجد مساحة كافية على القرص الصلب"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -278,35 +306,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "هل تريد البدء في عملية التحديث الان؟"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -315,154 +346,145 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -470,7 +492,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -478,7 +500,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -486,49 +508,82 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -575,7 +630,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -595,26 +650,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -635,64 +686,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -708,56 +759,112 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -765,41 +872,52 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -905,11 +1023,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1127,163 +1245,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index ab5a9315..70414c36 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:40+0000\n"
 "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Обновления на софтуера"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Изходен код"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Изходен код"
@@ -142,11 +142,11 @@ msgstr "Моля, въведете име за диска"
 msgid "Please insert a disc in the drive:"
 msgstr "Моля, поставете диск в устройството:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Повредени пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -155,33 +155,36 @@ msgstr ""
 "този софтуер. Моля, поправете ги със synaptic или apt-get преди да "
 "продължите!"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Не може да бъдат надградени изисквани мета-пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Ще трябва да бъде премахнат важен пакет"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Не може да бъде планирано надграждането"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Възникна непреодолим проблем при планиране на надграждането. Докладвайте "
 "това като грешка. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Грешка при удостоверяването автентичността на някои пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -191,12 +194,12 @@ msgstr ""
 "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-"
 "късно. Вижте по-долу списъка на неудоствоерените пакети."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Не може да се инсталира '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -205,11 +208,11 @@ msgstr ""
 "грешка! "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Не могат да бъдат предположени мета-пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -222,15 +225,42 @@ msgstr ""
 " Моля, преди да продължите, инсталирайте един от тези пакети, като "
 "използвате synaptic или apt-get!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Грешка при доставянето"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Четене на кеша"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Не е открит валиден огледален сървър"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -250,11 +280,11 @@ msgstr ""
 "Ако изберете \"Не\", актуализирането ще бъде отменено."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Генериране на източници по подразбиране?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -268,11 +298,11 @@ msgstr ""
 "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", "
 "актуализацията ще бъде отменена."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Информацията от хранилището е невалидна"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -280,11 +310,11 @@ msgstr ""
 "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, "
 "съобщете това като грешка!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Забранени са източници от трети страни"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -294,11 +324,11 @@ msgstr ""
 "Можете да ги разрешите отново след надграждането чрез инструмента software-"
 "properties или чрез synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Грешка по време на надграждане"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -306,11 +336,11 @@ msgstr ""
 "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с "
 "мрежата. Моля, проверете мрежовата връзка и опитайте пак!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Недостатъчно свободно място на диска"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -319,27 +349,31 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Желаете ли да започне надграждането?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Не можеше да бъдат инсталирани надгражданията"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Надграждането сега ще бъде прекратено. Системата Ви може да е в "
 "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Не можеше да бъдат свалени надгражданията"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -347,11 +381,11 @@ msgstr ""
 "Надграждането се прекратява. Моля, проверете Интернет връзката или "
 "инсталационния носител и опитайте отново! "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -360,23 +394,23 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Премахване на остарелите пакети?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "П_рескачане на стъпката"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Грешка при прехвърляне"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -385,111 +419,102 @@ msgstr ""
 "информация! "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Рестартиране на системата"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Проверка на диспечера на пакети"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Актуализиране информацията от хранилището"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 #, fuzzy
 msgid "Invalid package information"
 msgstr "Невалидна информация за пакет"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "След актуализиране не  информацията, важния пакет \"%s\" вече не може да "
 "бъде открит.\n"
 "Това показва сериозна грешка. Моля, съобщете за това!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Запитване за потвърждение"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Надграждане"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Търсене на остарял софтуер"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Надграждането на системата завърши."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Моля, поставете диск '%s' в устройство '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Свалянето е завършено"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Актуализацията е завършена"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Сваляне на файл %li от %li при %s/сек"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Прилагане на промените"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Не можеше да бъде инсталиран \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Надграждането се преустановява. Моля, съобщете това като грешка!"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -498,18 +523,20 @@ msgstr ""
 "Замяна на конфигурационния файл\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Командата \"diff\" не бе намерена"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Възникна фатална грешка"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Моля, съобщете това като грешка и включете файловете \"/var/log/dist-upgrade."
@@ -520,74 +547,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Пакетът %s ще бъде премахнат."
 msgstr[1] "Пакетите %s ще бъдат премахнати."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s нов пакет ще бъде инсталиран."
 msgstr[1] "%s нови пакети ще бъдат инталирани."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s пакет ще бъде надграден."
 msgstr[1] "%s нови пакети ще бъдат надградени."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Трябва да изтеглите данни общо %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Надграждането може да отнеме няколко часа, като не може да бъде отменено по-"
 "нататък."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "За да предодвратите загуба на данни, затворете всички отворени приложения и "
 "документи."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Не можеше да бъдат намерени надграждания"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Системата Ви вече е надградена."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Премахване на %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Инсталиране на %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Надграждане на %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Нужно е рестартиране"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?"
@@ -641,7 +702,8 @@ msgid "Difference between the files"
 msgstr "Разлика между файловете"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Изтегляне и инсталиране на надграждането"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -661,26 +723,22 @@ msgid "Terminal"
 msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Надграждане на Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Задържане"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Замяна"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Съобщи грешка"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Рестартирай сега"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Поднови надграждането"
 
@@ -701,49 +759,49 @@ msgid "Please check your internet connection."
 msgstr "Моля, проверете Интернет връзката си!"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Не може да бъде стартирана помощната програма за надграждане."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Това най-верроятно е грешка в помощната програма за надграждане. Моля, "
 "съобщете това като грешка!"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Изтегляне на помощната програма за надграждане"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 "Помощната програма за надграждане ще Ви води през процеса на надграждане."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Подпис на помощната програма за надграждане"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Помощна програма за надграждане"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Грешка при доставянето"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Доставянето на надграждането бе неуспешно. Възможно е да има проблем с "
 "мрежата. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Грешка при извличането"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -751,11 +809,11 @@ msgstr ""
 "Извличането на надграждането бе неуспешно. Възможно е да има проблем с "
 "мрежата или сървъра. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Грешка при удостоверяване"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -763,11 +821,11 @@ msgstr ""
 "Удостоверяването на надграждането не успя. Възможно е да има проблем с "
 "мрежата или със сървъра. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Идентификацията неуспешна"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -785,16 +843,16 @@ msgstr "Сваляне на файл %li от %li при %s/сек"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Сваляне на файл %li от %li при неизвестна скорост"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -802,12 +860,40 @@ msgstr ""
 "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
 "връзката си."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 актуализации на сигурността"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Надграждане до последната версия на Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Инсталиране на актуализациите"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Не могат да бъдат инсталирани всички актуализации"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -818,54 +904,96 @@ msgstr ""
 "пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в терминален "
 "прозорец, за да актуализирате напълно системата си."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Следните актуализации ще бъдат пропуснати:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версия %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Сваляне на списъка с промени..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Размер за изтегляне: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Системата Ви е актуална"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Можете да инсталирате %s актуализация"
 msgstr[1] "Можете да инсталирате %s актуализации"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Моля, изчакайте! Това може да отнеме известно време."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Актуализацията е завършена"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Нова версия: %s (Размер: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Версия %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Вашата дистрибуция вече не се поддържа"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -875,17 +1003,17 @@ msgstr ""
 "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com "
 "за повече информация за надграждането!"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Индексът на софтуера е повреден"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1006,11 +1134,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Актуализации по Интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Актуализации по Интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1261,178 +1390,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Инсталиране на актуализациите"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Официално поддържани"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Несвободни (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Официално поддържан"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Ограничени авторски права"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 обновления по сигурността"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 обновления"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
@@ -1483,6 +1618,15 @@ msgstr "DFSG-съвместим софтуер с несвободни зави�
 msgid "Non-DFSG-compatible Software"
 msgstr "Софтуер несъвместим с DFSG"
 
+#~ msgid "Download is complete"
+#~ msgstr "Свалянето е завършено"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Надграждането се преустановява. Моля, съобщете това като грешка!"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Надграждане на Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Скрий детайлите"
 
diff --git a/po/bn.po b/po/bn.po
index 0490bc35..9d645556 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-26 12:09+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n"
 "Language-Team: Bengali <bn@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "সফ্টওয়্যার আপডেট"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -138,53 +138,55 @@ msgstr "ডিস্কের জন্য একটি নাম দিন"
 msgid "Please insert a disc in the drive:"
 msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "ভাঙা প্যাকেজসমূহ"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "আপগ্রেড গণনা করতে পারছে না"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' ইন্সটল করা যাচ্ছে না"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -193,11 +195,11 @@ msgstr ""
 "রিপোর্ট করুন। "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "meta-package অনুমান করা যাচ্ছ না"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -206,15 +208,42 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "আনতে ব্যর্থ"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "ক্যাশ পড়া হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "কোন সঠিক মিরর পাওয়া যায় নি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -227,11 +256,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "ডিফল্ট sources তৈরি করে?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -245,11 +274,11 @@ msgstr ""
 "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল "
 "হবে।"
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "রিপোজিটরির তথ্য সঠিক নয়"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -257,22 +286,22 @@ msgstr ""
 "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ "
 "হিসাবে রিপোর্ট করুন।"
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "আপগ্রেড করার সময় সমস্যা"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -280,11 +309,11 @@ msgstr ""
 "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে "
 "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -293,25 +322,28 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "আপনি কি আপগ্রেড শুরু করতে চান?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "আপগ্রেড ইন্সটল করা যায় নি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "আপগ্রেড ডাউনলোড করা যায় নি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -319,11 +351,11 @@ msgstr ""
 "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা "
 "করুন এবং আবার চেষ্টা করুন। "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -332,130 +364,121 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "এই ধাপটি এড়িয়ে যাও (_এ)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "সরাও (_স)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "প্রেরণ করার সময় সমস্যা"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "সিস্টেমটি রিস্টার্ট করছি"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "ভুল প্যাকেজ তথ্য"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "তথ্যের জন্য জিজ্ঞাসা"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "আপগ্রেড করা হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "সিস্টেম আপগ্রেড সম্পন্ন।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "%li দিন %li ঘন্টা %li মিিনিট বাকি আছে"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "%li ঘন্টা %li মিিনিট বাকি আছে"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "%li মিিনিট বাকি আছে"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "%li সেকেন্ড বাকি আছে"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "দয়া করে '%s' ড্রাইভে '%s' প্রবেশ করান"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "ডাউনলোড সম্পন্ন"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "আপডেট সম্পন্ন"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr "%li of %li ফাইল ডাউনলোড করছে"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "%li মিিনিট বাকি আছে"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "পরিবর্তনগুলো প্রয়োগ করছি"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s' ইন্সটল করা যায় নি"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "আপগ্রেডটি নিস্ফল ভাবে বের হয়ে যাচ্ছ। অনুগ্রহ করে এই বাগটি রিপোর্ট করুন।"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -464,87 +487,122 @@ msgstr ""
 "কনফিগারেশন ফাইল '%s'\n"
 "কি সরানো হবে?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "'diff' কমান্ডটি পাওয়া যায় নি"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s টি প্যাকেজ মোছা হবে।"
 msgstr[1] "%s টি প্যাকেজ মোছা হবে।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।"
 msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।"
 msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "কোন আপগ্রেড পাওয়া যায় নি"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s মুছো</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s ইন্সটল"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s আপগ্রেড"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "%li দিন %li ঘন্টা %li মিিনিট বাকি আছে"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "%li ঘন্টা %li মিিনিট বাকি আছে"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "রিবুট করা প্রয়োজন"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?"
@@ -594,7 +652,8 @@ msgid "Difference between the files"
 msgstr "ফাইলগুলোর মধ্যে পার্থক্য"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "আপগ্রেড ডাউনলোড এবং ইন্সটল করা হচ্ছে"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -614,26 +673,22 @@ msgid "Terminal"
 msgstr "টার্মিন্যাল"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "উবুন্টু আপগ্রেড করছি"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "রাখো (_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "প্রতিস্হাপন (_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "বাগ রিপোর্ট (_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "এক্ষুনি রিস্টার্ট (_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "পুনরায় আপগ্রেড শুরু (_R)"
 
@@ -654,54 +709,54 @@ msgid "Please check your internet connection."
 msgstr "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "আপগ্রেড টুলটি চালানো যায় নি"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "এটি মনে হচ্ছে আপগ্রেড টুলের একটি বাগ। অনুগ্রহ করে বাগটি রিপোর্ট করুন"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "আপগ্রেড টুল ডাউনলোড করছি"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "আপগ্রেড টুলটি আপনাকে আপগ্রেড প্রক্রিয়ায় সাহায্য করবে।"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "আপগ্রেড টুল স্বাক্ষর"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "আপগ্রেড টুল"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "আনতে ব্যর্থ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "আপগ্রেডটি আনতে ব্যর্থ। নেটওয়ার্কে কোন সমস্যা থাকতে পারে। "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "এক্সট্রাক্ট করতে ব্যর্থ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr "আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে পারে। "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "যথার্থ্যতা পরীক্ষা করতে ব্যর্থ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -709,11 +764,11 @@ msgstr ""
 "আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা "
 "থাকতে পারে। "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "অনমোদন প্রক্রিয়া ব্যর্থ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -729,16 +784,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -746,83 +801,153 @@ msgid ""
 msgstr ""
 "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "আপডেট ইন্সটল করো (_I)"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "ভার্সন %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "ডাউনলোড এর আকার: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "আপনার সিস্টেম আপ-টু-ডেট"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন"
 msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "আপডেট সম্পন্ন"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "নতুন ভার্সন: %s (আকার: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "ভার্সন %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -930,11 +1055,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>ইন্টারনেট আপডেট</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>ইন্টারনেট আপডেট</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1159,177 +1285,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "আপডেট ইন্সটল করো (_I)"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "অফিসিয়াল ভাবে সমর্থিত"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "অফিসিয়াল ভাবে সমর্থিত"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
@@ -1380,6 +1512,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "%li সেকেন্ড বাকি আছে"
+
+#~ msgid "Download is complete"
+#~ msgstr "ডাউনলোড সম্পন্ন"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "আপগ্রেডটি নিস্ফল ভাবে বের হয়ে যাচ্ছ। অনুগ্রহ করে এই বাগটি রিপোর্ট করুন।"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "উবুন্টু আপগ্রেড করছি"
+
 #~ msgid "Hide details"
 #~ msgstr "বিস্তারিত আড়াল"
 
diff --git a/po/br.po b/po/br.po
index 7f2f655b..7a34aba8 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-19 02:42+0000\n"
 "Last-Translator: Oublieuse <oublieuse@gmail.com>\n"
 "Language-Team: Breton <br@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -138,64 +138,66 @@ msgstr "Roit un anv evit ar bladenn marplij"
 msgid "Please insert a disc in the drive:"
 msgstr "Lakait ur bladenn e-barzh ul lenner marplij:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Pakadoù torr"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -204,15 +206,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -225,11 +253,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -238,42 +266,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -282,35 +310,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -319,217 +350,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -576,7 +631,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -596,26 +651,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -636,64 +687,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -709,97 +760,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -905,11 +1023,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1128,163 +1246,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index d99c3c7f..25236054 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-29 21:18+0000\n"
 "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,27 +75,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Actualitzacions de programari"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Font"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Font"
@@ -143,11 +143,11 @@ msgstr "Introduïu un nom per al disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Inseriu un disc a la unitat:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -155,34 +155,37 @@ msgstr ""
 "El vostre sistema conté paquets trencats que no es poden arreglar amb "
 "aquesta aplicació. Utilitzeu el Synaptic o apt-get abans de continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 #, fuzzy
 msgid "Can't upgrade required meta-packages"
 msgstr "No s'han pogut actualitzar els metapaquets sol·licitats"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "S'haurà d'esborrar un paquet essencial"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "No s'ha pogut calcular l'actualització"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "S'ha produït un problema greu alhora de calcular l'actualització. Informeu "
 "de l'error. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "S'ha produït un error en autenticar alguns paquets"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
@@ -192,12 +195,12 @@ msgstr ""
 "amb la xarxa. Podeu provar-ho després. A continuació es mostra la llista amb "
 "els paquets no autenticats."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "No s'ha pogut instal·lar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -206,11 +209,11 @@ msgstr ""
 "els error. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -224,15 +227,42 @@ msgstr ""
 " Instal·leu algun dels paquets anteriors des del Synaptic o amb l'apt-get "
 "per poder continuar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Ha fallat l'extracció"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "S'està llegint la memòria cau"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "No s'ha trobat una rèplica vàlida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -245,11 +275,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -258,11 +288,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "La informació del dipòsit no és vàlida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -270,11 +300,11 @@ msgstr ""
 "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de "
 "l'error."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "S'han desactivat les fonts de tercers"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -284,11 +314,11 @@ msgstr ""
 "reactivar-los, després de l'actualització de programari, des de 'propietats "
 "del programari' o des del Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "S'ha produït un error en l'actualització"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -296,11 +326,11 @@ msgstr ""
 "S'ha produït un error mentre s'actualizava el vostre sistema. Comproveu la "
 "vostra connexió de xarxa i torneu a intentar-ho."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "No disposeu de suficient espai al disc"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -313,27 +343,31 @@ msgstr ""
 "apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Voleu iniciar l'actualització?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "No s'han pogut instal·lar les actualitzacions"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "L'actualització s'ha cancel·lat. El vostre sistema ha pogut quedar "
 "inservible.  S'ha executat una recuperació del sistema (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "No s'han pogut descarregar les actualitzacions"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -341,11 +375,11 @@ msgstr ""
 "S'ha cancel·lat l'actualització. Comproveu la vostra connexió a Internet o "
 "el mitjà d'instal·lació i torneu-ho a provar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Algun programari ja no es mantindrà oficialment"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -358,130 +392,121 @@ msgstr ""
 "\n"
 "Si no teniu activat 'universe' se us sugerirà que els desintal·leu. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Voleu esborrar els paquets obsolets?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Omet aquest pas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "Esbo_rra"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "S'està restaurant l'estat original del sistema"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "S'està comprovant el gestor de paquets"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "S'està actualitzant la informació del dipòsit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "La informació del paquet no és valida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Actualitzant"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "S'està cercant programari obsolet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "S'ha completat l'actualització del sistema"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Queden uns %li dies %li hores %li minuts"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Queden unes %li hores %li minuts"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Queden uns %li minuts"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Queden uns %li segons"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Inseriu '%s' a la unitat '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "S'ha completat la descàrrega"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "S'ha completat l'actualització"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "S'està descarregant el fitxer %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Queden uns %li minuts"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "S'està descarregant el fitxer %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "S'estan aplicant els canvis"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "No s'ha pogut instal·lar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "L'actualització s'ha cancel·lat. Informeu d'aquest error"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -490,91 +515,126 @@ msgstr ""
 "Voleu reemplaçar el fitxer de\n"
 "configuració '%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "No s'ha trobat l'ordre 'diff'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "S'ha produït un error greu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "S'esborrarà %s paquet"
 msgstr[1] "S'esborraran %s paquets"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "S'instal·larà %s paquet"
 msgstr[1] "S'instal·laran %s paquets"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "S'actualitzarà %s paquet"
 msgstr[1] "S'actualitzaran %s paquets"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Heu de descarregar un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "L'actualització pot durar algunes hores i no la podreu cancel·lar un cop "
 "hagi començat."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i "
 "aplicacions."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "No s'han pogut trobar actualitzacions"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "El vostre sistema ja està actualitzat"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Esborra %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instal·la %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Actualitza %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Queden uns %li dies %li hores %li minuts"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Queden unes %li hores %li minuts"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "És necessari que reinicieu el sistema"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -630,7 +690,8 @@ msgid "Difference between the files"
 msgstr "Diferències entre els fitxers"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "S'estan descarregant i instal·lant les actualitzacions"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -650,26 +711,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "S'està actualitzant Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Informa de l'error"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Reinicia"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Reprén l'actualització"
 
@@ -690,65 +747,65 @@ msgid "Please check your internet connection."
 msgstr "Comproveu la vostra connexió a Internet"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "No es pot executar l'eina d'actualització"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Això sembla un error de l'eina d'actualització. Informeu d'aquest error"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "S'està descarregant l'eina d'actualització"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "L'eina d'actualització us guiarà durant el procés d'actualització."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Signatura de l'eina d'actualització"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Eina d'actualització"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Ha fallat l'extracció"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Ha fallat la verificació"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -764,16 +821,16 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -781,12 +838,40 @@ msgstr ""
 "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió "
 "a Internet."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Debian Stable Security Updates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Actualitza a la darrera versió d'Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Instal·la les actualitzacions"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "No es poden instal·lar les actualitzacions disponibles"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -797,54 +882,96 @@ msgstr ""
 "funció \"Marca totes les actualitzacions\" del gestor de paquets \"Synaptic"
 "\" o executeu \"sudo apt-get dist-upgrade\" en un terminal."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Les següents actualitzacions s'ometran:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versió %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "S'està descarregant la llista de canvis..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Mida de la descàrrega: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Podeu instal·lar %s actualització"
 msgstr[1] "Podeu instal·lar %s actualitzacions"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Espereu, això pot tardar una estona."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "S'ha completat l'actualització"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Versió nova: %s (Mida: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versió %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "La vostra distribució ja no es mantindrà més"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -854,17 +981,17 @@ msgstr ""
 "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més "
 "informació."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Ja disposeu de la nova distribució '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "L'índex de programari s'ha trencat"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -986,11 +1113,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualitzacions d'Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Actualitzacions d'Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1233,177 +1361,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Instal·la les actualitzacions"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Paquets mantinguts oficialment (Main)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualitzacions d'Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualitzacions d'Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Paquets mantinguts oficialment (Main)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Paquets amb restriccions per copyright (Restricted)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualitzacions d'Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
@@ -1456,6 +1590,18 @@ msgstr "Programari compatible DFSG amb dependències no lliures"
 msgid "Non-DFSG-compatible Software"
 msgstr "Programari no compatible DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Queden uns %li segons"
+
+#~ msgid "Download is complete"
+#~ msgstr "S'ha completat la descàrrega"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "L'actualització s'ha cancel·lat. Informeu d'aquest error"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "S'està actualitzant Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Amaga els detalls"
 
diff --git a/po/cs.po b/po/cs.po
index 46455dbd..e87abdf8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-25 18:52+0000\n"
 "Last-Translator: Tomáš Hála <tomas@monty.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,26 +77,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Aktualizace softwaru"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Prosím zadejte jméno disku"
 msgid "Please insert a disc in the drive:"
 msgstr "Prosím vložte disk do mechaniky:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -151,33 +151,36 @@ 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Nemohu aktualizovat požadované meta-balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Základní balík by musel být odstraněn"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Nemohu vypočítat aktualizaci"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Při výpočtu aktualizace nastal neřešitelný problém. Prosím oznamte to jako "
 "chybu. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Chyba při ověření některých balíků"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -187,12 +190,12 @@ msgstr ""
 "problémem v síti. Možná to budete chtít zkusit později. Níže je uveden "
 "seznam neověřených balíků."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nemohu nainstalovat '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -200,11 +203,11 @@ msgstr ""
 "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Nemohu odhadnout meta-balík"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -217,15 +220,42 @@ msgstr ""
 " 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:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Chyba stahování"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Probíhá čtení cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Nenalezeno správné zrcadlo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -238,11 +268,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Vytvořit standardní zdroje?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -251,11 +281,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Neplatná informace zdroje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -263,22 +293,22 @@ msgstr ""
 "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako "
 "chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Zdroje třetích stran vypnuté"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Chyba během aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -286,11 +316,11 @@ 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Nedostatek volného místa na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -299,28 +329,32 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Chcete spustit aktualizaci?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Nelze nainstalovat aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Aktualizace byla předčasně ukončena. Váš systém může být v nepoužitelném "
 "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo "
 "Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Nelze stáhnout aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -328,11 +362,11 @@ msgstr ""
 "Aktualizace byla předčasně ukončena. Prosím zkontrolujte si připojení k "
 "internetu nebo instalační médium a zkuste to znovu. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -341,23 +375,23 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Odebrat zastaralé balíky?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Přeskočit tento krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Odebrat"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Chyba při zaznamenávání"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -366,107 +400,98 @@ msgstr ""
 "prohléhněte níže uvedenou zprávu. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Obnovuje se původní stav systému"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Kontroluje se manažer balíků"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Aktualizují se informace o úložišti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Požaduje se potvrzení"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Probíhá upgrade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Vyhledáván zastaralý software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Upgrade systému je dokončen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Zhruba %li hodin %li minut zbývá"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Zhruba %li minut zbývá"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Zhruba %li sekund zbývá"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Prosím vložte '%s' do mechaniky '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Stahování bylo dokončeno"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Aktualizace je dokončena"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Zhruba %li minut zbývá"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Stahuji soubor %li z %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Provádím změny"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nelze nainstalovat '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-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:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -475,18 +500,20 @@ msgstr ""
 "Nahradit soubor s nastavením\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Příkaz \"diff\" nebyl nalezen"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Nastala fatální chyba"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Prosím oznamte toto jako chybu a do zprávy připojte soubory /var/log/dist-"
@@ -496,7 +523,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -504,7 +531,7 @@ msgstr[0] "%s balík bude odstraněn."
 msgstr[1] "%s balíky budou odstraněny."
 msgstr[2] "%s balíků bude odstraněno."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -512,7 +539,7 @@ msgstr[0] "%s nový balík bude nainstalován."
 msgstr[1] "%s nové balíky budou nainstalovány."
 msgstr[2] "%s nových balíků bude nainstalováno."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -520,49 +547,83 @@ msgstr[0] "%s balík bude nahrazen vyšší verzí."
 msgstr[1] "%s balíky budou nahrazeny vyšší verzí."
 msgstr[2] "%s balíky bude nahrazeno vyšší verzí."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Bude staženo celkem %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Žádné upgrady nebyly nalezeny."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Váš systém byl již upgradován."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Odstranit %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Nainstalovat %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Upgradovat %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Zhruba %li hodin %li minut zbývá"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Zhruba %li hodin %li minut zbývá"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Vyžadován restartovat"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -616,7 +677,8 @@ msgid "Difference between the files"
 msgstr "Rozdíl mezi soubory"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Stahují a instalují se upgrady"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -636,26 +698,22 @@ msgid "Terminal"
 msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Upgraduje se Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Ponechat"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Oznámit chybu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Restartovat nyní"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Pokračovat v upgradu"
 
@@ -676,71 +734,71 @@ msgid "Please check your internet connection."
 msgstr "Prosím zkontrolujte své internetové připojení."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 #, fuzzy
 msgid "Could not run the upgrade tool"
 msgstr "Nelze nainstalovat upgrady"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Toto je s největší pravděpodobností chyba v nástroji pro přechod na novou "
 "verzi systému. Oznamte to jako chybu, prosím."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Stahuji nástroj pro přechod na novou verzi systému"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 "Nástroj pro přechod na novou verzi systému vás provede aktualizačním "
 "procesem."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Podpis nástroje pro přechod na novou verzi systému"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Aktualizační utilita"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Chyba stahování"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Stažení nástroje pro přechod na novou verzi systému se nepodařilo. "
 "Pravděpodobně je problém se sítí. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Nezdařilo se rozbalení"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Ověření selhalo."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autentizace selhala."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -756,58 +814,117 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Stahuji %li. soubor z %li neznámou rychlostí"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Upgradovat na poslední verzi Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Instaluji aktualizace"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Nelze nainstalovat všechny dostupné aktualizace"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Následující aktualizace budou přeskočeny:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verze %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Stahuji seznam změn ..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Stahovaná velikost: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Váš systém je aktuální"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -815,24 +932,35 @@ msgstr[0] "Můžete instalovat %s aktualizaci"
 msgstr[1] "Můžete instalovat %s aktualizace"
 msgstr[2] "Můžete instalovat %s aktualizací"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Prosím čekejte, může to nějakou dobu trvat."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Aktualizace je dokončena"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nová verze: %s (Velikost: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Verze %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Vaše distribude už není podporovaná"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -842,17 +970,17 @@ msgstr ""
 "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na "
 "vyšší verzi se podívejte na http://www.ubuntu.com."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -970,11 +1098,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Síťové aktualizace</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Síťové aktualizace</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1219,177 +1348,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Udržováno komunitou (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Nesvobodný (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Nesvobodný (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Instaluji aktualizace"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Oficiálně podporováno"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Udržováno komunitou (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Nesvobodný (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Oficiálně podporované"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Omezeno copyrightem"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Aktualizace"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1440,6 +1575,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Žádný DFSG kompatibilní  Software"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Zhruba %li sekund zbývá"
+
+#~ msgid "Download is complete"
+#~ msgstr "Stahování bylo dokončeno"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Upgrade byl předčasně ukončen. Prosím oznamte to jako chybu"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Upgraduje se Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Skrýt detaily"
 
diff --git a/po/da.po b/po/da.po
index 945665c1..2ced9a0d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:41+0000\n"
 "Last-Translator: Mathias-K <mathias@computergeil.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Opdateringer"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Indtast venligst et navn til disken"
 msgid "Please insert a disc in the drive:"
 msgstr "Indsæt venligst en disk i drevet:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -151,36 +151,38 @@ msgstr ""
 "Dit system indeholder ødelagte pakker som ikke kan repareres med dette "
 "program. Reparer dem venligst med synaptic eller apt-get før du fortsætter."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Kan ikke opgradere de krævede meta-pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 #, fuzzy
 msgid "A essential package would have to be removed"
 msgstr "Det ville være nødvendigt at fjerne en vigtig pakke"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 #, fuzzy
 msgid "Could not calculate the upgrade"
 msgstr "Kunne ikke udregne opgraderingen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Der forekom et uløseligt problem under beregningen af opgraderingen. "
 "Rapportér venligst dette som en fejl. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Fejl ved godkendelse af nogle pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -190,12 +192,12 @@ msgstr ""
 "Det anbefales du prøver igen senere. Se længere nede for en liste over "
 "pakker som ikke kunne godkendes."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -204,12 +206,12 @@ msgstr ""
 "som en fejl. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 #, fuzzy
 msgid "Can't guess meta-package"
 msgstr "Kan ikke gætte meta-pakke"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -223,15 +225,42 @@ msgstr ""
 " Installer venligst en af pakkerne nævnt herover ved hjælp af Synaptic eller "
 "apt-get før du fortsætter."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Fejl ved hentning"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Læser cache-mellemlager"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -244,11 +273,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -257,11 +286,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Arkivinformation ugyldig."
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -269,22 +298,22 @@ msgstr ""
 "Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette "
 "som en fejl."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Trediepartskilder er fravalgt"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Fejl under opdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -292,11 +321,11 @@ msgstr ""
 "En fejl forekom under opdateringen. Dette skyldes som regel et "
 "netværksproblem, tjek venligst din netværksforbindelse og prøv igen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Der er ikke nok fri diskplads"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -308,27 +337,31 @@ msgstr ""
 "køre 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Vil du starte opgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Kunne ikke installere opgraderingerne"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning "
 "blev foretaget (dpkg --configura -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Kunne ikke hente opgraderingerne"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -336,11 +369,11 @@ msgstr ""
 "Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit "
 "installationsmedie og prøv igen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Noget software er ikke længere officielt understøttet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -354,25 +387,25 @@ msgstr ""
 "Hvis du ikke har slået 'universe' til, vil fjernelsen af disse pakker blive "
 "foreslået i det næste trin. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Fjern forældede pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 #, fuzzy
 msgid "_Skip This Step"
 msgstr "_Spring dette trin over"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 #, fuzzy
 msgid "Error during commit"
 msgstr "Fejl under udførsel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -381,107 +414,98 @@ msgstr ""
 "information. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Genstarter oprindelig systemtilstand"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Undersøger pakkehåndtering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Opdaterer arkivinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Opgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Søger efter forældet software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Systemopgradering er fuldført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Tid tilbage(ca.): %li dage %li timer %li minutter"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Tid tilbage(ca.): %li timer %li minutter"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Tid tilbage(ca.): %li minutter"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Tid tilbage(ca.): %li sekunder"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Indsæt venligst '%s' i drevet '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Overførsel fuldført"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Opdatering udført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, fuzzy, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Henter fil %li af %li fra %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Tid tilbage(ca.): %li minutter"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Henter fil %li af %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Udfører ændringer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Kunne ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Opgraderingen afbryder nu. Rapporter venligst denne fejl."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -490,19 +514,20 @@ msgstr ""
 "Udskift opsætningsfilen\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Kommandoen 'diff' blev ikke fundet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "En alvorlig fejl opstod"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 #, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Raporter venligst dette som en fejl og inkuder filerne /var/log/dist-upgrade."
@@ -512,70 +537,104 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pakke vil blive fjernet."
 msgstr[1] "%s pakker vil blive fjernet."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s ny pakke vil blive installeret."
 msgstr[1] "%s nye pakker vil blive installeret."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pakke vil blive opgraderet."
 msgstr[1] "%s pakker vil bliver opgraderet."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, fuzzy, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Der skal i alt hentes %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Kunne ikke finde nogen tilgængelige opgraderinger"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Dit system er allerede opgraderet."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Fjern %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Installer %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Opgrader %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Tid tilbage(ca.): %li dage %li timer %li minutter"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Tid tilbage(ca.): %li timer %li minutter"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Genstart af maskinen er påkrævet"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -630,7 +689,8 @@ msgid "Difference between the files"
 msgstr "Forskel mellem filerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Henter og installerer opgraderingerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -651,26 +711,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Opgraderer Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Behold"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Erstat"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Rapporter fejl"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Genstart nu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Genoptag opgradering"
 
@@ -691,47 +747,47 @@ msgid "Please check your internet connection."
 msgstr "Undersøg venligst din internetforbindelse"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Kunne ikke køre opgraderingsværktøjet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Dette er højst sandsynligt en fejl i opgraderingsværktøjet. Raporter "
 "venligst dette som en fejl."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Henter opgraderingsværktøjet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Opgraderingsværktøjet vil guide dig igennem opgraderings processen."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Opgrader værkstøjets signatur."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Opgraderingesværktøj"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Fejl ved hentning"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Hentning af opgraderingen fejlede. Det kan være være et netværksproblem. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Fejl ved udpakning"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -739,11 +795,11 @@ msgstr ""
 "Udpakningen af opgraderingen fejlede. Det kan være et problem med netværket "
 "eller med serveren. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Efterprøvning fejlede"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -751,11 +807,11 @@ msgstr ""
 "Efterprøvning af opgraderingen fejlede. Det er muligvis en fejl i netværket "
 "eller på serveren. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Godkendelse mislykkedes"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -773,16 +829,16 @@ msgstr "Henter fil %li af %li med %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Henter fil %li af %li med ukendt hastighed"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -791,12 +847,40 @@ msgstr ""
 "Fejl ved hentning af ændringslisten. Undersøg venligst din "
 "internetforbindelse."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Opgrader til seneste version af Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Installer Opdateringer"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Kan ikke installere alle tilgængelige opdateringer"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -806,54 +890,96 @@ msgstr ""
 "opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo "
 "apt-get dist-upgrade\" i en terminal for at opdatere dit system fuldstændigt."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Følgende opdateringer vil blive sprunget over:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Henter listen med ændringer..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Overføringsstørelse: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Dit system er opdateret"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Du kan installere %s opdatering"
 msgstr[1] "Du kan installere %s opdateringer"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Vent venligst, dette kan tage et stykke tid."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Opdatering udført"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Ny version: %s (Size: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribution understøtes ikke længere"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -863,17 +989,17 @@ msgstr ""
 "opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www."
 "ubuntu.com (engalsk) for mere informaiton om opgradering."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Software indexet er i stykker"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -996,11 +1122,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetopdateringer</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internetopdateringer</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1252,181 +1379,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Vedligeholdt af fællesskabet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Ikke frit programmel (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Ikke frit programmel (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Installer Opdateringer"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officielt understøttet"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Opdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Opdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Vedligeholdt af fællesskabet (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Ikke frit programmel (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officielt understøttet"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 #, fuzzy
 msgid "Restricted copyright"
 msgstr "Begrænset copyright"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Opdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1477,6 +1610,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Tid tilbage(ca.): %li sekunder"
+
+#~ msgid "Download is complete"
+#~ msgstr "Overførsel fuldført"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Opgraderingen afbryder nu. Rapporter venligst denne fejl."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Opgraderer Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Skjul detaljer"
 
diff --git a/po/de.po b/po/de.po
index 62d0a33a..6728403b 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-27 10:58+0000\n"
 "Last-Translator: Sebastian Heinlein <glatzor@gmx.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Software-Aktualisierungen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Quellen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Quellen"
@@ -145,11 +145,11 @@ msgstr "Geben Sie einen Namen für das Medium ein"
 msgid "Please insert a disc in the drive:"
 msgstr "Bitte legen Sie ein Medium in das Laufwerk:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Defekte Pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -158,33 +158,36 @@ msgstr ""
 "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor "
 "Sie fortfahren."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Ein grundlegendes Paket müsste entfernt werden"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Die Aktualisierung konnte nicht berechnet werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Ein unlösbares Problem trat beim Berechnen der Aktualisierung auf. Bitte "
 "erstellen Sie hierfür einen Fehlerbericht. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -195,12 +198,12 @@ msgstr ""
 "später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre "
 "Echtheit hin bestätigt werden:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "›%s‹ kann nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -209,11 +212,11 @@ msgstr ""
 "Sie hierfür einen Fehlerbericht. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Metapaket konnte nicht bestimmt werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -227,15 +230,42 @@ msgstr ""
 " Bitte installieren Sie eines der obigen Pakete über Synaptic oder apt-get, "
 "bevor Sie fortfahren."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Herunterladen ist fehlgeschlagen"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Zwischenspeicher wird ausgelesen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Kein gültiger Mirror gefunden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -255,11 +285,11 @@ msgstr ""
 "Wenn Sie 'Nein' wählen, wird das Update abgebrochen."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Standardquellen generieren?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -273,11 +303,11 @@ msgstr ""
 "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' "
 "auswählen, wird das Update abgebrochen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Ungültige Kanalinformationen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -285,11 +315,11 @@ msgstr ""
 "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte "
 "erstellen Sie einen Fehlerbericht."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Quellen von Drittanbietern deaktiviert"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -299,11 +329,11 @@ msgstr ""
 "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug "
 "oder mit Synaptic reaktivieren."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Fehler während der Aktualisierung"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -312,11 +342,11 @@ msgstr ""
 "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre "
 "Netzwerkverbindung und versuchen Sie es noch einmal."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Unzureichender freier Festplattenspeicher"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -328,28 +358,32 @@ msgstr ""
 "temporäre Pakete von frühreren Installation mit 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Möchten Sie die Aktualisierung starten?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Die Aktualisierungen konnten nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Das Upgrade wird jetzt abgebrochen. Ihr System kann sich in einem "
 "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt "
 "(dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -358,11 +392,11 @@ msgstr ""
 "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch "
 "einmal. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -376,23 +410,23 @@ msgstr ""
 "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten "
 "Schritt zum Entfernen vorgeschlagen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Veraltete Pakete entfernen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "Ü_berspringen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Fehler beim Anwenden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -401,113 +435,102 @@ msgstr ""
 "Nachricht für nähere Informationen. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Wiederherstellen des alten Systemzustandes"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Paketverwaltung wird überprüft"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Aktualisiere Quellen-Information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Ungültige Paketinformationen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Nachdem Ihre Paketinformationen aktualisiert wurden, ist das unbedingt "
 "erforderliche Paket '%s' nicht mehr auffindbar.\n"
 "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür "
 "einen Fehlerbericht."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Nach Bestätigung fragen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Aktualisiere"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Nach veralteter Software wird gesucht"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Aktualisierung ist abgeschlossen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Ungefähr %li Tag(e) %li Stunde(n) %li Minute(n) verbleibend"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Ungefähr %li Stunde(n) %li Minute(n) verbleibend"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Ungefähr %li Minute(n) verbleibend"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Ungefähr %li Sekunden verbleibend"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Bitte legen Sie das Medium »%s« in das Laufwerk »%s«"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Herunterladen abgeschlossen"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Aktualisierung ist abgeschlossen"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Lade Datei %li von %li mit %s/s herunter"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Ungefähr %li Minute(n) verbleibend"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Lade Datei %li von %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Änderungen werden angewendet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "›%s‹ konnte nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür einen "
-"Fehlerbericht."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -516,18 +539,20 @@ msgstr ""
 "Die Konfigurationsdatei\n"
 "»%s« ersetzen?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Das 'diff'-Kommando konnte nicht gefunden werden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Ein fataler Fehler ist aufgetreten"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Bitte melden Sie dies als Bug und fügen Sie die Dateien /var/log/dist-"
@@ -538,74 +563,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s Paket wird entfernt."
 msgstr[1] "%s Pakete werden entfernt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s neues Paket wird installiert."
 msgstr[1] "%s neue Pakete werden installiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s Paket wird aktualisiert."
 msgstr[1] "%s Pakete werden aktualisiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Insgesamt müssen %s heruntergeladen werden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr "
 "abgebrochen werden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und "
 "Dokumente."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Es liegen keine Aktualisierungen vor"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Ihr System wurde bereits aktualisiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s wird entfernt</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s wird installiert"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s wird aktualisiert"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Ungefähr %li Tag(e) %li Stunde(n) %li Minute(n) verbleibend"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Ungefähr %li Stunde(n) %li Minute(n) verbleibend"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Neustart erforderlich"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -662,7 +721,8 @@ msgid "Difference between the files"
 msgstr "Unterschiede zwischen den Dateien"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Aktualisierungen herunterladen und installieren"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -682,26 +742,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Ubuntu aktualisieren"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Beibehalten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Fehlerbericht ausfüllen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Neu starten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Aktualisierung fortsetzen"
 
@@ -722,50 +778,50 @@ msgid "Please check your internet connection."
 msgstr "Bitte überprüfen Sie Ihre Internet-Verbindung."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Konnte die Anwendung zur Aktualisierung nicht starten"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Sehr wahrscheinlich handelt es sich hierbei um einen Fehler in der "
 "Aktualisierungsverwaltung. Bitte erstellen Sie einen Fehlerbericht."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Aktualisierungsanwendung wird heruntergeladen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 "Die Aktualisierungsanwendung wird Sie durch den Aktualisierungsprozess "
 "führen."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Signatur der Aktualisierungsanwendung"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Aktualisierungsanwendung"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Herunterladen ist fehlgeschlagen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Das Laden der Aktualisierungen ist fehlgeschlagen. Möglicherweise gibt es "
 "ein Netzwerkproblem "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Extrahieren ist fehlgeschlagen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -773,11 +829,11 @@ msgstr ""
 "Das Extrahieren der Aktualisierung ist fehlgeschlagen. Möglicherweise gibt "
 "es Probleme im Netzwerk oder am Server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verifikation fehlgeschlagen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -785,11 +841,11 @@ msgstr ""
 "Die Prüfung der Aktualisierung ist fehlgeschlagen. Möglicherweise gibt es "
 "Probleme im Netzwerk oder am Server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Echtheitsbestätigung fehlgeschlagen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -807,20 +863,20 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
 "Sie es zu einem späteren Zeitpunkt erneut."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
 "Sie es zu einem späteren Zeitpunkt erneut."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -828,12 +884,40 @@ msgstr ""
 "Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte "
 "überprüfen Sie Ihre Internet-Verbindung."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Aus die neueste Version von Ubuntu aktualisieren"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Aktualisierungen werden installiert"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -844,54 +928,96 @@ msgstr ""
 "Paketverwaltung oder führen Sie den Befehl »sudo apt-get dist-upgrade« in "
 "einem Terminal aus, um Ihr System vollständig zu aktualisieren."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Die folgenden Aktualisierungen werden ausgelassen:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Liste mit Änderungen wird heruntergeladen..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Download-Größe: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Ihr System ist auf dem aktuellen Stand"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Sie können %s Aktualisierung installieren"
 msgstr[1] "Sie können %s Aktualisierungen installieren"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Aktualisierung ist abgeschlossen"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Neue Version: %s (Größe: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Ihre Distribution wird nicht länger unterstützt"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -902,17 +1028,17 @@ msgstr ""
 "System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers."
 "de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Neue Version '%s' der Distribution ist freigegeben</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Der Software-Index ist beschädigt"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1034,11 +1160,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-Aktualisierungen</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet-Aktualisierungen</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1290,177 +1417,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Von der Gemeinschaft betreut (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Unfrei (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Unfrei (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Aktualisierungen werden installiert"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Offiziell unterstützt"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Aktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Aktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Von der Gemeinschaft betreut (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Unfrei (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Offiziell unterstützt"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Urheberrechtlich eingeschränkt"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Aktualisierungen"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1511,6 +1644,20 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten"
 msgid "Non-DFSG-compatible Software"
 msgstr "Nicht DFSG-kompatible Software"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Ungefähr %li Sekunden verbleibend"
+
+#~ msgid "Download is complete"
+#~ msgstr "Herunterladen abgeschlossen"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür "
+#~ "einen Fehlerbericht."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Ubuntu aktualisieren"
+
 #~ msgid "Hide details"
 #~ msgstr "Details verbergen"
 
diff --git a/po/el.po b/po/el.po
index 82637cee..c913c3da 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-25 15:39+0000\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,25 +75,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr "Κανάλι λογισμικού"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκ
 msgid "Please insert a disc in the drive:"
 msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Κατεστραμμένα πακέτα"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -153,33 +153,36 @@ msgstr ""
 "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-"
 "get για να συνεχίσετε."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Αδυναμία υπολογισμού της αναβάθμισης"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης. "
 "Παρακαλώ αναφέρετε το ως σφάλμα. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -189,12 +192,12 @@ msgstr ""
 "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των "
 "μη πιστοποιημένων πακέτων."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -203,11 +206,11 @@ msgstr ""
 "ως σφάλμα. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Αδυναμία εύρεσης μετα-πακέτου"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -221,15 +224,42 @@ msgstr ""
 "Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να "
 "συνεχίσετε."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Αποτυχία λήψης"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Ανάγνωση λανθάνουσας μνήμης"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -250,11 +280,11 @@ msgstr ""
 " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Δημιουργία προεπιλεγμένων πηγών;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -268,11 +298,11 @@ msgstr ""
 "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε "
 "'Όχι' η ενημέρωση θα ακυρωθεί."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Μη έγκυρες πληροφορίες repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -280,11 +310,11 @@ msgstr ""
 "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο "
 "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Απενεργοποιήθηκαν πηγές τρίτων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -294,11 +324,11 @@ msgstr ""
 "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-"
 "properties' ή με το synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Σφάλμα κατά την ενημέρωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -306,11 +336,11 @@ msgstr ""
 "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει "
 "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -322,27 +352,31 @@ msgstr ""
 "προηγούμενων εγκαταστάσεων με  την εντολή 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. "
 "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Αδυναμία λήψης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -350,11 +384,11 @@ msgstr ""
 "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
 "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -368,23 +402,23 @@ msgstr ""
 "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση "
 "αυτών των πακέτων στο επόμενο βήμα. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Αφαίρεση παρωχημένων πακέτων;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "Παράκα_μψη αυτου του βήματος"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Απομάκρυνση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Σφάλμα κατά την υποβολή"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -393,110 +427,101 @@ msgstr ""
 "παρακάτω μήνυμα για περισσότερες πληροφορίες. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Έλεγχος διαχειριστή πακέτων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Ενημέρωση πληροφοριών repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Μη έγκυρες πληροφορίες πακέτου"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Μετά την ενημέρωση των πληροφοριών πακέτων, δεν μπορεί να βρεθεί το "
 "απαραίτητο πακέτο '%s'.\n"
 " Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Ερώτηση για επιβεβαίωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Γίνεται αναβάθμιση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Απομένουν περίπου %li ημέρες %li ώρες και %li λεπτά"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Απομένουν περίπου %li ώρες και %li λεπτά"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Απομένουν περίπου %li λεπτά"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Απομένουν περίπου %li δευτερόλεπτα"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Η λήψη ολοκληρώθηκε"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Η ενημέρωση ολοκληρώθηκε"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Λήψη αρχείου %li από %li με %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Απομένουν περίπου %li λεπτά"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Γίνεται εφαρμογή αλλαγών"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Η αναβάθμιση θα τερματιστεί τώρα. Παρακαλώ αναφέρετε το ως σφάλμα."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -505,18 +530,20 @@ msgstr ""
 "Αντικατάσταση αρχείου ρύθμισης\n"
 "'%s';"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Η εντολή 'diff' δεν βρέθηκε"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Προέκυψε μοιραίο σφάλμα"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία /var/log/dist-"
@@ -527,74 +554,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί."
 msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί."
 msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί."
 msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η ακύρωση "
 "της αργότερα."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και "
 "έγγραφα."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Δεν βρέθηκαν αναβαθμίσεις"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Απομάκρυνση %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Εγκατάσταση %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Αναβάθμιση %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Απομένουν περίπου %li ημέρες %li ώρες και %li λεπτά"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Απομένουν περίπου %li ώρες και %li λεπτά"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Απαιτείται επανεκκίνηση"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -650,7 +711,8 @@ msgid "Difference between the files"
 msgstr "Διαφορά μεταξύ των αρχείων"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Λήψη και εγκατάσταση των αναβαθμίσεων"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -670,26 +732,22 @@ msgid "Terminal"
 msgstr "Τερματικό"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Αναβάθμιση Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Διατήρηση"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "Αντικατά_σταση"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "Ανα_φορά σφάλματος"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "Επανε_κκίνηση τώρα"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Συνέχεια αναβάθμισης"
 
@@ -710,46 +768,46 @@ msgid "Please check your internet connection."
 msgstr "Παρακαλώ ελέγξτε τη σύνδεση σας με το διαδίκτυο."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Αδυναμία εκτέλεσης του εργαλείου αναβαθμίσεων"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Αυτό πιθανόν να είναι σφάλμα του εργαλείου αναβάθμισης. Παρακαλώ αναφέρετε "
 "το ως σφάλμα."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Λήψη του εργαλείου αναβάθμισης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Το εργαλείο αναβάθμισης θα σας καθοδηγήσει στην διαδικασία ενημέρωσης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Υπογραφή εργαλείου αναβάθμισης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Εργαλείο αναβάθμισης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Αποτυχία λήψης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Η λήψη της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Αποτυχία αποσυμπίεσης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -757,11 +815,11 @@ msgstr ""
 "Η αποσυμπίεση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
 "εξυπηρετητή. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Αποτυχία επαλήθευσης"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -769,11 +827,11 @@ msgstr ""
 "Η επαλήθευση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
 "εξυπηρετητή. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Η πιστοποίηση απέτυχε"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -791,18 +849,18 @@ msgstr "Λήψη αρχείου %li από %li με %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -810,12 +868,40 @@ msgstr ""
 "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
 "διαδίκτυο."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Εγκατάσταση ενημερώσεων"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -826,54 +912,96 @@ msgstr ""
 "διαχειριστή πακέτων ή την εντολή \"sudo apt-get dist-upgrade\" σε ένα "
 "τερματικό για να αναβαθμίσετε πλήρως το σύστημα σας."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Έκδοση%s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Λήψη της λίστας των αλλαγών..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Μέγεθος λήψης: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Το σύστημα σας είναι ενημερωμένο"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση"
 msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Η ενημέρωση ολοκληρώθηκε"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Νέα έκδοση: %s (Μέγεθος: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Έκδοση%s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Η διανομή σας δεν υποστηρίζεται πια"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -884,17 +1012,17 @@ msgstr ""
 "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες "
 "για την αναβάθμιση."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1016,11 +1144,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1266,177 +1395,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Όχι-ελεύθερα (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Όχι-ελεύθερα (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Εγκατάσταση ενημερώσεων"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Με επίσημη υποστήριξη"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Αναβαθμίσεις  Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Αναβαθμίσεις  Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Όχι-ελεύθερα (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Oficially supported"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Περιορισμένα πνευματικά δικαιώματα"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Αναβαθμίσεις  Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1487,6 +1622,18 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες
 msgid "Non-DFSG-compatible Software"
 msgstr "Λογισμικό μη συμβατό με DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Απομένουν περίπου %li δευτερόλεπτα"
+
+#~ msgid "Download is complete"
+#~ msgstr "Η λήψη ολοκληρώθηκε"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Η αναβάθμιση θα τερματιστεί τώρα. Παρακαλώ αναφέρετε το ως σφάλμα."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Αναβάθμιση Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Απόκρυψη λεπτομερειών"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index b2fce2b8..d27d9d13 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-26 21:06+0000\n"
 "Last-Translator: David Symons <david.symons@liberatedcomputing.net>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Software Updates"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Please enter a name for the disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Please insert a disc in the drive:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Broken packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -151,33 +151,36 @@ msgstr ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Can't upgrade required meta-packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "An essential package would have to be removed"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Could not calculate the upgrade"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "An unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Error authenticating some packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -187,12 +190,12 @@ msgstr ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Can't install '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -201,11 +204,11 @@ msgstr ""
 "bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Can't guess meta-packag"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -219,15 +222,42 @@ msgstr ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Failed to fetch"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Reading cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "No valid mirror found"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -247,11 +277,11 @@ msgstr ""
 "If you select 'no' the update will cancel."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Generate default sources?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -264,11 +294,11 @@ msgstr ""
 "Should default entries for '%s' be added? If you select 'No' the update will "
 "cancel."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Repository information invalid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -276,11 +306,11 @@ msgstr ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Third party sources disabled"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -290,11 +320,11 @@ msgstr ""
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Error during update"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -302,11 +332,11 @@ msgstr ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Not enough free disk space"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -318,27 +348,31 @@ msgstr ""
 "'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Do you want to start the upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Could not install the upgrades"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Could not download the upgrades"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -346,11 +380,11 @@ msgstr ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Some software no longer officially supported"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -364,23 +398,23 @@ msgstr ""
 "If you don't have 'universe' enabled these packages will be suggested for "
 "removal in the next step. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Remove obsolete packages?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Skip This Step"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Error during commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -389,110 +423,101 @@ msgstr ""
 "information. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Restoring original system state"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Checking package manager"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Updating repository information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Invalid package information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Asking for confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Upgrading"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Searching for obsolete software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "System upgrade is complete."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "About %li days %li hours %li minutes remaining"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "About %li hours %li minutes remaining"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "About %li minutes remaining"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "About %li seconds remaining"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Please insert '%s' into the drive '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Download is complete"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Update is complete"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Downloading file %li of %li at %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "About %li minutes remaining"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Downloading file %li of %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Applying changes"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Could not install '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -502,18 +527,20 @@ msgstr ""
 "\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "The 'diff' command was not found"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "A fatal error occured"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -523,71 +550,105 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s package is going to be removed."
 msgstr[1] "%s packages are going to be removed."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s new package is going to be installed."
 msgstr[1] "%s new packages are going to be installed."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s package is going to be upgraded."
 msgstr[1] "%s packages are going to be upgraded."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "You have to download a total of %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "To prevent data loss close all open applications and documents."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Could not find any upgrades"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Your system has already been upgraded."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Remove %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Install %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Upgrade %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "About %li days %li hours %li minutes remaining"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "About %li hours %li minutes remaining"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Reboot required"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -642,7 +703,8 @@ msgid "Difference between the files"
 msgstr "Difference between the files"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Downloading and installing the upgrades"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -662,26 +724,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Upgrading Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Keep"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Restart Now"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Resume Upgrade"
 
@@ -702,45 +760,45 @@ msgid "Please check your internet connection."
 msgstr "Please check your internet connection."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Could not run the upgrade tool"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Downloading the upgrade tool"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "The upgrade tool will guide you through the upgrade process."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Upgrade tool signature"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Upgrade tool"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Failed to fetch"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Fetching the upgrade failed. There may be a network problem. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Failed to extract"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -748,11 +806,11 @@ msgstr ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verfication failed"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -760,11 +818,11 @@ msgstr ""
 "Verifying the upgrade failed. There may be a problem with the network or "
 "with the server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -782,16 +840,16 @@ msgstr "Downloading file %li of %li with %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Downloading file %li of %li with unknown speed"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "The list of changes is not available yet. Please try again later."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "The list of changes is not available yet. Please try again later."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -799,12 +857,40 @@ msgstr ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Security Updates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Upgrade to the latest version of Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Install Updates"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Cannot install all available updates"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -814,54 +900,96 @@ msgstr ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "The following updates will be skipped:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Downloading the list of changes..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Download size: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "You can install %s update"
 msgstr[1] "You can install %s updates"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Please wait, this can take some time."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Update is complete"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "New version: %s (Size: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is not supported anymore"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -871,17 +999,17 @@ msgstr ""
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>New distribution release '%s' is available</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Software index is broken"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1004,11 +1132,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1256,178 +1385,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Install Updates"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officially supported"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1478,6 +1613,18 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies"
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "About %li seconds remaining"
+
+#~ msgid "Download is complete"
+#~ msgstr "Download is complete"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "The upgrade aborts now. Please report this bug."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Upgrading Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Hide details"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 4a369995..d11908c9 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:41+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Software Updates"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Source"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Source"
@@ -139,55 +139,57 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "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:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -196,11 +198,11 @@ msgstr ""
 "The key you selected could not be removed. Please report this as a bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -209,15 +211,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -230,11 +258,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -243,43 +271,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Error removing the key"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -288,35 +316,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -325,223 +356,245 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"The key you selected could not be removed. Please report this as a bug."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -589,7 +642,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -609,27 +662,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Reload"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Upgrade finished"
@@ -651,68 +700,68 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 #, fuzzy
 msgid "Upgrade tool"
 msgstr "Upgrade finished"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "A_uthentication"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -728,16 +777,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "There is a new release of Ubuntu available!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -746,87 +795,156 @@ msgstr ""
 "Failed to download changes. Please check if there is an active internet "
 "connection."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Install"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 #, fuzzy
 msgid "The following updates will be skipped:"
 msgstr "The following packages are not upgraded:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Cancel downloading the ChangeLog"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installing updates..."
 msgstr[1] "Installing updates..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is no longer supported"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -936,12 +1054,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet Updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Internet Updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1179,183 +1298,189 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Install"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officially supported"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
@@ -1408,6 +1533,11 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "The key you selected could not be removed. Please report this as a bug."
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Details</b>"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index c52c6360..f501a497 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:41+0000\n"
 "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
 "Language-Team: \n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Software Updates"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Source"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Source"
@@ -138,55 +138,57 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "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:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -195,11 +197,11 @@ msgstr ""
 "The key you selected could not be removed. Please report this as a bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -208,15 +210,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -229,11 +257,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -242,43 +270,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Error removing the key"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -287,35 +315,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -324,224 +355,246 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Checking system configuration"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"The key you selected could not be removed. Please report this as a bug."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -589,7 +642,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -609,27 +662,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Reload"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -650,68 +699,68 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "Downloading Changes"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "A_uthentication"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -727,16 +776,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "There is a new release of Ubuntu available!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -745,87 +794,156 @@ msgstr ""
 "Failed to download changes. Please check if there is an active internet "
 "connection."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Security Updates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Installing updates..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 #, fuzzy
 msgid "The following updates will be skipped:"
 msgstr "The following packages are not upgraded:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Downloading Changes"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installing updates..."
 msgstr[1] "Installing updates..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is no longer supported"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -934,12 +1052,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet Updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Internet Updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1180,181 +1299,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Installing updates..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officially supported"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
@@ -1409,6 +1534,11 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "The key you selected could not be removed. Please report this as a bug."
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Details</b>"
 
diff --git a/po/es.po b/po/es.po
index c94cd689..f3c3ed85 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-26 09:38+0000\n"
 "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
@@ -69,7 +69,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -78,27 +78,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Actualizaciones de software"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Fuente"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Fuente"
@@ -146,11 +146,11 @@ msgstr "Por favor, introduzca un nombre para el disco"
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor, inserte un disco en la unidad:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -159,33 +159,36 @@ msgstr ""
 "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de "
 "continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "No se han podido actualizar los meta-paquetes requeridos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Se ha tenido que desinstalar un paquete esencial"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "No se ha podido calcular la actualización"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Ha ocurrido un problema imposible de resolver cuando se calculaba la "
 "actualización. Por favor, informe de ésto como un fallo. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Error autenticando algunos paquetes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -195,12 +198,12 @@ msgstr ""
 "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una "
 "lista de los paquetes no autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "No se ha podido instalar «%s»"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -209,11 +212,11 @@ msgstr ""
 "como un fallo. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "No se ha podido determinar el meta-paquete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -227,15 +230,42 @@ msgstr ""
 " Por favor, instale uno de los paquetes anteriores usando Synaptic o apt-get "
 "antes de proceder."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Error al descargar"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Leyendo caché"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "No se ha encontrado un servidor espejo válido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -256,11 +286,11 @@ msgstr ""
 "Si selecciona «No» se cancelará la actualización."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "¿Generar orígenes predeterminados?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -274,11 +304,11 @@ msgstr ""
 "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se "
 "cancelará la actualización."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Información de repositorio no válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -286,11 +316,11 @@ 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:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Orígenes de terceros desactivados"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -300,11 +330,11 @@ msgstr ""
 "volver a activarlas tras la actualización con la herramienta «Propiedades "
 "del software», o con Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Error durante la actualización"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -313,11 +343,11 @@ msgstr ""
 "tipo de problema en la red, por lo que le recomendamos que compruebe su "
 "conexión de red y vuelva a intentarlo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "No hay espacio suficiente en el disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -329,28 +359,32 @@ msgstr ""
 "de instalaciones anteriores tecleando «sudo apt-get clean» en una terminal."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "¿Desea comenzar la actualización?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "No se han podido instalar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "La actualización se interrumpirá ahora. Su sistema puede haber quedado en un "
 "estado inutilizable. Se está llevando a cabo una recuperación (dpkg --"
 "configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "No se han podido descargar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -358,11 +392,11 @@ msgstr ""
 "La actualización se interrumpirá ahora. Por favor, compruebe su conexión a "
 "Internet (o su soporte de instalación) y vuelva a intentarlo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Algunos programas ya no están soportados oficialmente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -376,23 +410,23 @@ msgstr ""
 "Si no tiene activado el «universe», se le sugerirá que desinstale estos "
 "paquetes en el siguiente paso. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "¿Desinstalar los paquetes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Saltar este paso"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Error durante la confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -401,112 +435,101 @@ msgstr ""
 "inferior para más información. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Restaurando el estado original del sistema"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Comprobando gestor de paquetes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Actualizando la información del repositorio"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Información de paquete no válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Después de haberse actualizado la información de sus paquetes, ya no es "
 "posible encontrar el paquete esencial «%s».\n"
 "Esto indica un problema serio; por favor, informe de esto como un fallo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Solicitando confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Actualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Buscando paquetes obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "La actualización del sistema se ha completado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Faltan %li dias %li horas %li minutos"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Faltan %li horas %li minutos"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Faltan %li minutos"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Faltan %li segundos"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor, inserte «%s» en la unidad «%s»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "La descarga se ha completado"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "La actualización se ha completado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Descargando archivo %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Faltan %li minutos"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Descargando archivo %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Aplicando los cambios"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "No se ha podido instalar «%s»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"La actualización se cancelará ahora. Por favor, informe de esto como un "
-"fallo."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -515,18 +538,20 @@ msgstr ""
 "¿Desea reemplazar el archivo de configuración\n"
 "«%s»?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "No se ha encontrado el comando «diff»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Ha ocurrido un error fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Por favor, informe de esto como un fallo e incluya los archivos /var/log/"
@@ -537,74 +562,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Se va a desinstalar %s paquete."
 msgstr[1] "Se van a desinstalar %s paquetes."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "Se va a instalar %s paquete nuevo."
 msgstr[1] "Se van a instalar %s paquetes nuevos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "Se va a actualizar %s paquete."
 msgstr[1] "Se van a actualizar %s paquetes."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Debe descargar un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "La actualización puede durar varias horas, y no podrá ser cancelada después "
 "en ningún momento."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "No se ha podido encontrar ninguna actualización"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Su sistema ya ha sido actualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Desinstalar %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Faltan %li dias %li horas %li minutos"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Faltan %li horas %li minutos"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Se requiere reiniciar el equipo"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -659,7 +718,8 @@ msgid "Difference between the files"
 msgstr "Diferencia entre los archivos"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Descargando e instalando las actualizaciones"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -679,26 +739,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Actualizando Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Conservar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Sustituir"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Informar de un error"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Reiniciar ahora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Continuar actualización"
 
@@ -719,50 +775,50 @@ msgid "Please check your internet connection."
 msgstr "Por favor, compruebe su conexión a Internet."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "No se ha podido ejecutar la herramienta de actualización"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Esto parece ser un fallo en la herramienta de actualización. Por favor, "
 "informe de ésto como un error."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Descargando la herramienta de actualización"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 "La herramienta de actualización le guiará a través del proceso de "
 "actualización."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Firma de la herramienta de actualización"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Herramienta de actualización"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Error al descargar"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Ha fallado la descarga de la actualización. Puede haber un problema con la "
 "red. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Error al extraer"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -770,11 +826,11 @@ msgstr ""
 "Ha fallado la extracción de la actualización. Puede haber un problema con la "
 "red o el servidor. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Error de verificación"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -782,11 +838,11 @@ msgstr ""
 "Ha fallado la verificación de la actualización. Puede haber un problema con "
 "la red o el servidor. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Error de autenticación"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -804,20 +860,20 @@ msgstr "Descargando archivo %li de %li a %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Descargando archivo %li de %li a velocidad desconocida"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
 "más tarde."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
 "más tarde."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -825,12 +881,40 @@ msgstr ""
 "Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su "
 "conexión a Internet."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Actualizar a la última versión de Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Instalando actualizaciones"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "No se han podido instalar todas las actualizaciones disponibles"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -841,54 +925,96 @@ msgstr ""
 "«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para "
 "actualizar completamente su sistema."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Se pasarán por alto las siguientes actualizaciones:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versión %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Descargando la lista de cambios..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Tamaño de descarga: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Su sistema está actualizado"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Puede instalar %s actualización"
 msgstr[1] "Puede instalar %s actualizaciones"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Por favor, espere; esto puede tardar un poco."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "La actualización se ha completado"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nueva versión: %s (Tamaño: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versión %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Su distribución ya no está soportada"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -898,17 +1024,17 @@ msgstr ""
 "críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite http://"
 "www.ubuntu.com para más información sobre la actualización."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "El índice de software está dañado"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1030,11 +1156,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizaciones por Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Actualizaciones por Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1284,177 +1411,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 «Dapper Drake»"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Mantenido por la comunidad (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Software no libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Software no libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 «Dapper Drake»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Instalando actualizaciones"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizaciones de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "«Backports» de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizaciones de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "«Backports» de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Mantenido por la comunidad (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Software no libre (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Soportado oficialmente"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Copyright restringido"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Actualizaciones de seguridad"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizaciones de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "«Backports» de Ubuntu 5.10"
@@ -1505,6 +1638,20 @@ msgstr "Software compatible con la DFSG con dependencias no libres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Faltan %li segundos"
+
+#~ msgid "Download is complete"
+#~ msgstr "La descarga se ha completado"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "La actualización se cancelará ahora. Por favor, informe de esto como un "
+#~ "fallo."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Actualizando Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Ocultar detalles"
 
diff --git a/po/fi.po b/po/fi.po
index e2fdf322..f6cbc552 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-25 18:26+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,26 +75,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr "Ohjelmistokanava"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Lähdekoodi"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Lähdekoodi"
@@ -141,11 +141,11 @@ msgstr "Syötä nimi levylle"
 msgid "Please insert a disc in the drive:"
 msgstr "Aseta levy asemaan:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Rikkinäisiä paketteja"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -154,33 +154,36 @@ msgstr ""
 "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen "
 "jatkamista."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Ei voida päivittää tarvittavia metapaketteja"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Välttämätön paketti jouduttaisiin poistamaan"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "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:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Joitain paketteja todennettaessa tapahtui virhe"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -190,12 +193,12 @@ msgstr ""
 "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista "
 "paketeista."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Ei voitu asentaa pakettia \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -203,11 +206,11 @@ msgstr ""
 "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Ei voitu arvata metapakettia"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -221,15 +224,42 @@ msgstr ""
 "Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla "
 "ennen jatkamista."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Ei voitu noutaa"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Luetaan kätköä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Ei löytynyt sopivaa palvelinta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -250,11 +280,11 @@ msgstr ""
 "Jos valitset \"Ei\", päivitys keskeytyy."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Luo ja ota käyttöön oletusohjelmalähteet?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -267,11 +297,11 @@ msgstr ""
 "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys "
 "keskeytyy."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Virhe ohjelmavarastotiedoissa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -279,11 +309,11 @@ msgstr ""
 "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita "
 "tästä virheraportilla."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -293,11 +323,11 @@ msgstr ""
 "käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen \"ohjelma-"
 "asetukset\"-työkalulla tai Synaptic-ohjelmalla."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Virhe päivitettäessä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -305,11 +335,11 @@ msgstr ""
 "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. "
 "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Levytilaa ei ole riittävästi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -321,27 +351,31 @@ msgstr ""
 "komentoa 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Haluatko aloittaaa päivityksen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Ei voitu asentaa päivityksiä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. "
 "Korjaustoimenpiteet suoritettiin (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Päivityksiä ei voitu noutaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -349,11 +383,11 @@ msgstr ""
 "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. "
 "CD) toiminta ja yritä uudelleen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -367,23 +401,23 @@ msgstr ""
 "Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit "
 "suositellaan poistettaviksi seuraavassa kohdassa. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Poista vanhentuneet paketit?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Ohita tämä kohta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Virhe suoritettaesa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -392,110 +426,101 @@ msgstr ""
 "lisätietoja. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Palautetaan alkuperäistä järjestelmän tilaa"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Tarkistetaan pakettienhallintaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Päivitetään ohjelmavarastotietoja"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Pakettitiedot viallisia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Pakettitietojen päivitysten jälkeen pakollista ohjelmapakettia \"%s\" ei "
 "enää löydetty.\n"
 "Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Pyydetään vahvistusta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Päivitetään"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Etsitään vanhetuneita ohjelmia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Järjestelmän päivitys on valmis."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Noin %li päivää, %li tuntia, %li minuuttia jäljellä"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Noin %li tuntia, %li minuuttia jäljellä"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Noin %li minuuttia jäljellä"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Noin %li sekuntia jäljellä"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Laita '%s' asemaan '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Lataus on valmis"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Päivitys on valmis"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Noin %li minuuttia jäljellä"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Noudetaan tiedostoa %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Toteutetaan muutoksia"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Ei voituu asentaa: '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -504,18 +529,20 @@ msgstr ""
 "Korvataanko asetustiedosto\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Komentoa 'diff' ei löytynyt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Vakava virhe tapahtui"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot /var/log/dist-"
@@ -523,72 +550,106 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s paketti poistetaan"
 msgstr[1] "%s pakettia poistetaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s uusi paketti asennetaan"
 msgstr[1] "%s uutta pakettia asennetaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s paketti päivitetään"
 msgstr[1] "%s pakettia päivitetään"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Noudettavaa yhteensä %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Päivityksiä ei löytynyt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Järjestelmäsi on jo päivitetty."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Poista %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Asenna %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Päivitä %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Noin %li päivää, %li tuntia, %li minuuttia jäljellä"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Noin %li tuntia, %li minuuttia jäljellä"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Uudellenkäynnistys vaaditaan"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -645,7 +706,8 @@ msgid "Difference between the files"
 msgstr "Tiedostojen väliset erot"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Noudetaan ja asennetaan päivityksiä"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -665,26 +727,22 @@ msgid "Terminal"
 msgstr "Pääte"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Päivitetään Ubuntua"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Pidä"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Tee virheraportti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Uudelleenkäynnistä nyt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Jatka päivitystä"
 
@@ -705,47 +763,47 @@ msgid "Please check your internet connection."
 msgstr "Tarkista Internet-yhteytesti toimivuus."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Ei voitu suorittaa päivitystyökalua"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Tämä on luultavasti ohjelmavirhe päivitystyökalussa. Ilmoita tästä "
 "virheraportilla."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Ladataan päivitystyökalua"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Päivitystyökalu ohjaa päivityksen suorittamisessa."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Päivitä työkalun allekirjoitus"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Päivitä työkalu"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Ei voitu noutaa"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Päivityksen noutaminen epäonnistui. Tämä voi johtua verkko-ongelmasta. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Ei voitu purkaa"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -753,11 +811,11 @@ msgstr ""
 "Päivityksen purkaminen epäonnistui. Tämä voi johtua ongelmasta "
 "verkkoyhteydessä tai palvelimessa. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Tarkistus epäonnistui"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -765,11 +823,11 @@ msgstr ""
 "Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta "
 "verkkoyhteydessä tai palvelimessa. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -787,28 +845,56 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 "Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Päivitä Ubuntun viimeisimpään versioon"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Asennetaan päivityksiä"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -818,54 +904,97 @@ msgstr ""
 "kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai "
 "suorita päätteessä komento \"sudo apt-get dist-upgrade\"."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Seuraavat päivitykset ohitetaan:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versio: %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Noudetaan muutosluetteloa..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+#, fuzzy
+msgid "None"
+msgstr "Ei-vapaa"
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "%s täytyy noutaa"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Järjestelmäsi on ajan tasalla"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Voit asentaa %s päivityksen"
 msgstr[1] "Voit asentaa %s päivitystä"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Odota, tämä voi kestää jonkun aikaa."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Päivitys on valmis"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Uusi versio: %s (koko: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versio: %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Jakeluasi ei enää tueta"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -875,17 +1004,17 @@ msgstr ""
 "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja "
 "päivittämisestä osoitteesta http://www.ubuntu.com/"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Ohjelmaluettelo on rikkinäinen"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1006,11 +1135,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-päivitykset</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet-päivitykset</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1257,177 +1387,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Ei-vapaat ohjelmat (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Ei-vapaat ohjelmat (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Asennetaan päivityksiä"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Virallisesti tuettu"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 päivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 takaisinsovitukset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 päivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 takaisinsovitukset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Ei-vapaat ohjelmat (multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Virallisesti tuettu"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Rajoitettu tekijänoikeus"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 päivitykset"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 takaisinsovitukset"
@@ -1479,6 +1615,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmat"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Noin %li sekuntia jäljellä"
+
+#~ msgid "Download is complete"
+#~ msgstr "Lataus on valmis"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Päivitetään Ubuntua"
+
 #~ msgid "Hide details"
 #~ msgstr "Piilota yksityiskohdat"
 
@@ -1900,6 +2048,3 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
 
 #~ msgid "0"
 #~ msgstr "0"
-
-#~ msgid "Non-free"
-#~ msgstr "Ei-vapaa"
diff --git a/po/fr.po b/po/fr.po
index 58dd3821..d8a8e79f 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-26 21:09+0000\n"
 "Last-Translator: Claude Paroz <paroz@email.ch>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Mises à jour des logiciels"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Source"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Source"
@@ -144,11 +144,11 @@ msgstr "Veuillez saisir un nom pour le disque"
 msgid "Please insert a disc in the drive:"
 msgstr "Veuillez insérer un disque dans le lecteur :"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -157,33 +157,36 @@ msgstr ""
 "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get "
 "avant de continuer."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Les meta-paquets désirés n'ont pu être mis à jour"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Un paquet essentiel devrait être enlevé"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Impossible de calculer la mise à jour"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Un problème insoluble est apparu lors du calcul de la mise à jour. Merci "
 "rapporter ce bogue. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Erreur lors de l'authentification de certains paquets"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
@@ -193,12 +196,12 @@ msgstr ""
 "problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. "
 "Vous trouverez ci-dessous une liste des paquets non authentifiés."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -207,11 +210,11 @@ msgstr ""
 "rapporter ce bogue. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Impossible de déterminer le méta-paquet"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -225,15 +228,42 @@ msgstr ""
 " Veuillez d'abord installer l'un des paquets ci-dessus, en utilisant "
 "Synaptic ou apt-get, avant de continuer."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Impossible d'établir la connexion"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Lecture du cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Aucun mirroir valide n'a pu être trouvé"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -254,11 +284,11 @@ msgstr ""
 "Sinon, la mise à jour sera annulée."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Générer les sources par défaut ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -272,11 +302,11 @@ msgstr ""
 "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous "
 "sélectionnez « Non », la mise à jour sera annulée."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Informations sur le dépôt invalides"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -284,11 +314,11 @@ msgstr ""
 "La mise à jour des informations du dépôt a créé un fichier invalide. Merci "
 "de rapporter ce bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Sources provenant de tiers désactivées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -298,11 +328,11 @@ msgstr ""
 "désactivées. Vous pouvez les réactiver après la mise à jour avec l'outil « "
 "Gestionnaire de canaux logiciels » ou avec Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Erreur lors de la mise à jour"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -311,11 +341,11 @@ msgstr ""
 "un problème de réseau. Veuillez vérifier votre connexion au réseau et "
 "réessayer."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Il n'y a pas assez d'espace libre sur le disque"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -328,27 +358,31 @@ msgstr ""
 "get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Voulez-vous commencer la mise à jour ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Les mises à jour n'ont pu être installées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Abandon de la mise à jour. Votre système est peut-être inutilisable. Une "
 "recupération a été lancée (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Les mises à jour n'ont pu être téléchargées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -356,11 +390,11 @@ msgstr ""
 "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou "
 "votre médium d'installation puis réessayez. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Certains logiciels ne sont plus supportés officiellement"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -374,23 +408,23 @@ msgstr ""
 "Si vous n'avez pas activé le dépot 'universe', la suppression de ces paquets "
 "vous sera suggérée lors de la prochaine étape. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Enlever les paquets obsolètes ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Passer cette étape"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Erreur pendant la soumission"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -399,111 +433,102 @@ msgstr ""
 "ci-dessous pour plus d'informations. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Restaurer le système dans son état d'origine"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Vérification du gestionnaire de paquets"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Mise à jour des informations sur les dépôts en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Information sur les paquet invalides"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Après la mise à jour des informations de votre paquet, le paquet « %s », "
 "pourtant requis, n'a pu être trouvé.\n"
 "Ceci est indique qu'une erreur important s'est produite, veuillez rapporter "
 "ce bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Demande de confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Mise à jour en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Recherche de logiciels obsolètes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "La mise à jour du système est terminée."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Environ %li jours %li heures %li minutes restantes"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Environ %li heures %li minutes restantes"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Environ %li minutes restantes"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Environ %li secondes restantes"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Veuillez insérer « %s » dans le lecteur « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Le téléchargement est terminé"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "La mise à jour est terminée"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Téléchargement du fichier %li sur %li à %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Environ %li minutes restantes"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Téléchargement du fichier %li sur %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Application des changements"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "La mise à jour vient d'échouer. Merci de rapporter ce bog.ue"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -512,18 +537,20 @@ msgstr ""
 "Remplacer le fichier de configuration\n"
 "« %s » ?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "La commande « diff » n'a pu être trouvée"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Une erreur fatale est survenue"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Veuillez signaler ce bogue et joindre les fichiers /var/log/dist-upgrade.log "
@@ -534,74 +561,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Le paquet %s va être supprimé."
 msgstr[1] "Les paquets %s vont être supprimés."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "Le paquet %s va être installé."
 msgstr[1] "Les paquets %s vont être installés."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "Le paquet %s va être mis à jour."
 msgstr[1] "Les paquets %s vont être mis à jour."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Vous devez télécharger un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "La mise à jour peut prendre plusieurs heures et ne peut être annulée "
 "ultérieurement."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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 et documents ouverts."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Aucune mise à jour n'est disponible"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Votre système a déjà été mis à jour."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Supprimer %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Installer %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Mettre à jour %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Environ %li jours %li heures %li minutes restantes"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Environ %li heures %li minutes restantes"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Redémarrage de l'ordinateur requis"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -658,7 +719,8 @@ msgid "Difference between the files"
 msgstr "Différence entre les fichiers"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Téléchargement et installation des mises à jour"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -678,26 +740,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Mettre à jour Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Conserver"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Rapporter un bogue"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Redémarrer Maintenant"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Reprendre la mise à jour"
 
@@ -718,48 +776,48 @@ msgid "Please check your internet connection."
 msgstr "Veuillez vérifier votre connexion Internet."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Impossible de lancer l'outil de mise à jour"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Un problème insoluble est apparu lors du calcul de la mise à jour. Merci de "
 "rapporter ce bogue."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Téléchargement de l'outil de mise à jour"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Cet outil vous guidera à travers le processus de mise à jour"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Signature de l'outil de mise à jour"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Outil de mise à jour"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Impossible d'établir la connexion"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "La recherche de la mise à jour à échoué. Il y a peut-être un problème "
 "réseau. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Impossible d'extraire"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -767,11 +825,11 @@ msgstr ""
 "L'extraction de la mise à jour a échoué. Il y a peut-être un problème de "
 "réseau ou avec le serveur. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Échec de la vérification"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -779,11 +837,11 @@ msgstr ""
 "La vérification de la mise à jour à échoué. Il y a peut-être un problème "
 "avec le réseau ou avec le serveur. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Échec de l'authentification"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -801,20 +859,20 @@ msgstr "Téléchargement du fichier %li sur %li à %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "La liste des modifications n'est pas encore disponible. Veuillez réessayer "
 "plus tard."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "La liste des modifications n'est pas encore disponible. Veuillez réessayer "
 "plus tard."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -822,12 +880,40 @@ msgstr ""
 "Échec du téléchargement de la liste des modifications. Veuillez vérifier que "
 "votre connexion Internet est activée."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Mettre à jour vers la version la plus récente d'Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Installation des mises à jour"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Impossible d'installer toutes les mises à jour disponibles"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -838,54 +924,96 @@ msgstr ""
 "jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo apt-get dist-"
 "upgrade » dans un terminal pour mettre votre système complètement à jour."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Les paquets suivants ne seront pas mis à jour :"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s : \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Téléchargement de la liste des nouveautés…"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Taille du téléchargement : %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Votre système est à jour"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Vous pouvez installer %s mise à jour"
 msgstr[1] "Vous pouvez installer %s mises à jour"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Veuillez patienter, cela peut prendre du temps."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "La mise à jour est terminée"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nouvelle version : %s (taille : %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s : \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Votre distribution n'est plus supportée"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -895,17 +1023,17 @@ msgstr ""
 "devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur "
 "http://www.ubuntu.com pour de plus amples informations à ce sujet."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Une nouvelle version « %s » est disponible</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "La liste des logiciels est corrompue"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1028,11 +1156,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Mises à jour par Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Mises à jour par Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1285,177 +1414,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu Dapper Drake 6.06"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Maintenu par la communauté (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu Dapper Drake 6.06"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Installation des mises à jour"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu Breezy Badger 5.10"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Supportés officiellement"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu Breezy Badger 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Mises à jour pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "« Backports » pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Mises à jour de sécurité"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Mises à jour de sécurité"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Mises à jour pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "« Backports » pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu Breezy Badger 5.10"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Maintenu par la communauté (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non-libre (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Supporté officiellement"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Copyright restreint"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Mises à jour de sécurité"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Mises à jour pour Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "« Backports » pour Ubuntu 5.10"
@@ -1508,6 +1643,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Environ %li secondes restantes"
+
+#~ msgid "Download is complete"
+#~ msgstr "Le téléchargement est terminé"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "La mise à jour vient d'échouer. Merci de rapporter ce bog.ue"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Mettre à jour Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Masquer les détails"
 
diff --git a/po/fur.po b/po/fur.po
index 0f023bf6..d8f58fc1 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-30 14:37+0000\n"
 "Last-Translator: marcuz <marcuz@linux.it>\n"
 "Language-Team: Friulian <fur@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -134,64 +134,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +202,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -221,11 +249,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -234,42 +262,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -278,35 +306,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -315,217 +346,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -572,7 +627,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -592,26 +647,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -632,64 +683,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -705,97 +756,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -901,11 +1019,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1123,163 +1241,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index e01f692f..f2bf7111 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:42+0000\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Actualizacións de software"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Fonte"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Fonte"
@@ -142,56 +142,58 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
 "erro. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -201,11 +203,11 @@ msgstr ""
 "erro. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -214,15 +216,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -235,11 +263,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -248,43 +276,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Erro ao quitar a clave"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -293,35 +321,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -330,223 +361,244 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Xa hai outro xestor de paquetes en execución"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualización rematada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Descargando cambios..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -594,7 +646,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -614,27 +666,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Recargar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -655,11 +703,11 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
@@ -667,57 +715,57 @@ msgstr ""
 "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
 "erro."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "Descargando cambios"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autenticación"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -733,16 +781,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Hai unha versión nova de Ubuntu dispoñible!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -751,87 +799,156 @@ msgstr ""
 "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión "
 "activa."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Actualizacións de seguranza de Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Instalando actualizacións..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Cannot install all available updates"
 msgstr "Comprobando se hai actualizacións..."
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versión %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Descargando cambios"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Instalando actualizacións..."
 msgstr[1] "Instalando actualizacións..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versión %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "A súa distribución xa non está soportada"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -940,12 +1057,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizacións por Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Actualizacións por Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1185,181 +1303,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Actualizacións de Ubuntu 5.04"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Mantido pola comunidade (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Actualizacións de Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Instalando actualizacións..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Soporte oficial"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Mantido pola comunidade (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non libre (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Soporte oficial"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Dereito de copia restrinxido"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizacións de Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
@@ -1414,6 +1538,12 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, 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."
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Detalles</b>"
 
diff --git a/po/he.po b/po/he.po
index 11dd8e71..e6b616b3 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-30 11:15+0000\n"
 "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -71,7 +71,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -80,27 +80,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "עדכוני תוכנה"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "מקור"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "מקור"
@@ -144,11 +144,11 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr "אנא הכניסו תקליטור לכונן:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "חבילות פגומות"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -156,54 +156,56 @@ msgstr ""
 "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן "
 "באמצעות synaptic או apt-get לפני שתמשיך."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "חבילה חיונית תוסר בלית ברירה"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "לא ניתן להתקין את \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -212,15 +214,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -233,11 +261,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -246,32 +274,32 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "שגיאה במהלך העדכון"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -279,11 +307,11 @@ msgstr ""
 "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת "
 "שלכם ונסו שנית."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "אין מספיק שטח בדיסק הקשיח"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -292,36 +320,39 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "האם ברצונך להתחיל את השדרוג?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "לא ניתן להתקין את השדרוג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "לא ניתן להוריד את השדרוג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -330,222 +361,247 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_דלג על השלב"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "מאתחל את המערכת"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n"
 "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "משדרג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "שדרוג המערכת הושלם."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "נותרו בערך %li ימים, %li שעות ו-%li דקות."
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "נותרו בערך %li שעות ו-%li דקות."
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "נותרו %li דקות."
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "נותרו %li שניות."
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "אנא הכניסו את \"%s\" לכונן \"%s\"."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
 msgstr "ההורדה הושלמה"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "נותרו %li דקות."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "מוריד שינויים..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "חבילה חדשה %s תותקן."
 msgstr[1] "%s חבילות חדשות יותקנו."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "חבילה %s תשודרג."
 msgstr[1] "%s חבילות ישודרגו."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "יש להוריד %s בסה\"כ."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "השדרוג עשוי לקחת מספר שעות, ולא ניתן לבטלו בשלב מאוחר יותר."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "לא ניתן למצוא שדרוג זמין"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "המערכת כבר שודרגה."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>הסר %s </b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "התקן %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "שדרג %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "נותרו בערך %li ימים, %li שעות ו-%li דקות."
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "נותרו בערך %li שעות ו-%li דקות."
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -593,8 +649,9 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
-msgstr ""
+#, fuzzy
+msgid "Fetching and installing the upgrades"
+msgstr "לא ניתן להתקין את השדרוג"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -613,26 +670,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_החלף"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_דווח על באג"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_אתחל עכשיו"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_המשך בשידרוג"
 
@@ -653,66 +706,66 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "מוריד שינוייים"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "כלי שדרוג"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "האימות נכשל"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -728,103 +781,173 @@ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "גרסה חדשה של אובונטו זמינה!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "עדכוני אבטחה - אובונטו 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "משדרג את אובונטו"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "מתקין עדכונים..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "לא ניתן להתקין את כל העדכונים הזמינים"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "גרסה %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "מוריד שינוייים"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "המערכת שלך מעודכנת!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "מתקין עדכונים..."
 msgstr[1] "מתקין עדכונים..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 #, fuzzy
 msgid "Update is complete"
 msgstr "ההורדה הושלמה"
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "גרסה %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "ההפצה שלך כבר לא נתמכת, סליחה."
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -933,12 +1056,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>עדכוני אינטרנט</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>עדכוני אינטרנט</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1178,181 +1302,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "עדכונים - אובונטו 5.04"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "מתוחזק ע\"י קהילה (Universe("
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "לא-חופשי (Multiverse("
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "לא-חופשי (Multiverse("
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "עדכונים - אובונטו 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "מתקין עדכונים..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "נתמך רשמית"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "מתוחזק ע\"י קהילה (Universe("
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "לא-חופשי (Multiverse("
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "נתמך רשמית"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "זכויות יוצרים מגבילות"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
@@ -1406,6 +1536,16 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "נותרו %li שניות."
+
+#~ msgid "Download is complete"
+#~ msgstr "ההורדה הושלמה"
+
+#, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
+
 #, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>פרטים</b>"
diff --git a/po/hi.po b/po/hi.po
index d74f18ea..528a945a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:46+0000\n"
 "Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
 "Language-Team: Hindi <hi@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -134,64 +134,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +202,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -221,11 +249,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -234,42 +262,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -278,35 +306,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -315,217 +346,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -572,7 +627,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -592,26 +647,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -632,64 +683,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -705,97 +756,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -901,11 +1019,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1123,163 +1241,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 1ebed52d..79eb7a83 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 20:54+0000\n"
 "Last-Translator: Ante Karamatić <ivoks@ubuntu.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,26 +77,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Nadogradnje programa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgstr "Upišite ime za disk"
 msgid "Please insert a disc in the drive:"
 msgstr "Ubacite CD u uređaj:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Pokvareni paketi"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -152,33 +152,36 @@ msgstr ""
 "Vaš sistem sadrži pokvarene pakete koji nisu mogli biti popravljeni sa ovim "
 "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Ne mogu nadograditi potrebne meta-pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Bitan paket bi morao biti uklonjen"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Nisam mogao riješiti nadogradnju"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Neriješiv problem se pojavio prilikom rješavanja nadogradnje. Molimo "
 "prijavite ovo kao grešku. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Greška prilikom identificiranja nekih paketa"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,12 +191,12 @@ msgstr ""
 "problem sa mrežom i trebali biste kasnije pokušati ponovo. Pogledajte popis "
 "neidentificiranih paketa."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Ne mogu instalirati '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -202,11 +205,11 @@ msgstr ""
 "grešku. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Nisam mogao odrediti meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -219,15 +222,42 @@ msgstr ""
 " Prije nastavljanja, molim instalirajte jedan od gore navedenih paketa "
 "koristeći synaptic ili apt-get."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Preuzimanje nije uspjelo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Čitam spremnik"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Nisam našao ispravan zrcalni poslužitelj"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -247,11 +277,11 @@ msgstr ""
 "Ako odaberete 'ne' nadogradnja će se prekinuti."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Kreirati uobičajene izvore?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -264,11 +294,11 @@ msgstr ""
 "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će "
 "prekinuti."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Podaci repozitorija neispravni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -276,11 +306,11 @@ msgstr ""
 "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. "
 "Molim, prijavite ovo kao bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Izvori trećih strana su isključeni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -290,11 +320,11 @@ msgstr ""
 "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa "
 "synapticom."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Greška prilikom nadogradnje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -302,11 +332,11 @@ msgstr ""
 "Pojavio se problem prilikom nadogradnje. Obično se radi o mrežnom problemu, "
 "pa vas molim da provjerite vašu mrežu i pokušate ponovo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Nema dovoljno praznog mjesta na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -318,27 +348,31 @@ msgstr ""
 "koristeći 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Želite li pokrenuti nadogradnju?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Nisam mogao instalirati nadogradnje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. "
 "Obnavljanje je pokrenuto (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Nisam mogao preuzeti nadogradnje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -346,11 +380,11 @@ msgstr ""
 "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili "
 "instalacijski medij i pokušajte ponovo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Neki paketi više nisu službeno podržani"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -364,23 +398,23 @@ msgstr ""
 "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za "
 "uklanjanje. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Ukloniti zastarjele pakete?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Preskoči ovaj korak"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Greška prilikom čina"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -389,110 +423,101 @@ msgstr ""
 "više informacija. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Vraćam u početno stanje"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Provjeravam upravitelja paketima"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Nadograđujem podatke repozitorija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Neispravni podaci paketa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Nakon što su podaci paketa nadograđeni, bitan paket '%s' se ne može više "
 "naći.\n"
 "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Pitam za potvrdu"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Nadograđujem"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Tražim zastarjele programe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Nadogradnja sustava je završena."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Otprilike je ostalo %li dana %li say i %li minuta"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Otprilike je ostalo %li sati i %li minuta"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Otprilike je ostalo %li minuta"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Otprilike je ostalo %li sekundi"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Molim, ubacite '%s' u uređaj '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Preuzimanje je završeno"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Nadogradnja je gotova"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Preuzimam datoteku %li od %li pri %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Otprilike je ostalo %li minuta"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Preuzimam datoteku %li od %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Primjenjujem promjene"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nisam mogao instalirati '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Nadogradnja se prekida. Molim, prijavite ovaj bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -501,18 +526,20 @@ msgstr ""
 "Zamijeniti konfiguracijsku datoteku\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Nisam našao naredbu 'diff'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Pojavila se ozbiljna greška"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Molim, prijavite ovo kao bug i uključite datoteke /var/log/dist-upgrade.log "
@@ -523,7 +550,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -531,7 +558,7 @@ msgstr[0] "%s paket će biti uklonjen."
 msgstr[1] "%s paketa će biti uklonjena."
 msgstr[2] "%s paketa će biti uklonjeno."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -539,7 +566,7 @@ msgstr[0] "%s novi paket će biti instaliran."
 msgstr[1] "%s nova paketa će biti instalirana."
 msgstr[2] "%s novih paketa će biti instalirano."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -547,51 +574,85 @@ msgstr[0] "%s paket će biti nadograđen."
 msgstr[1] "%s paketa će biti nadograđena."
 msgstr[2] "%s paketa će biti nadograđeno."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Morate preuzeti ukupno %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Nadogradnja može potrajati nekoliko sati i ne može biti prekinuta niti u "
 "jednom trenutku."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Nisam mogao naći niti jednu nadogradnju"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Vaš sustav je već nadograđen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Ukloni %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instaliraj %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Nadogradi %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Otprilike je ostalo %li dana %li say i %li minuta"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Otprilike je ostalo %li sati i %li minuta"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Potrebno je ponovno pokretanje računala"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -648,7 +709,8 @@ msgid "Difference between the files"
 msgstr "Razlike između datoteka"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Preuzimam i instaliram nadogradnje"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -668,26 +730,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Nadograđujem Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Zadrži"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "Za_mijeni"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Prijavi bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "Ponovno pok_reni računalo"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Nastavi nadogradnju"
 
@@ -708,46 +766,46 @@ msgid "Please check your internet connection."
 msgstr "Molim, provjerite vašu internet vezu."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Nisam mogao pokrenuti alat za nadogradnju"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Ovo je najvjerovatnije greška u alatu za nadogradnju. Molim, prijavite ovo "
 "kao bug"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Dobavljam alat za nadogradnju"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Alat za nadogradnju će vas voditi kroz proces nadogradnje."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Potpis alata za nadogradnju"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Alat za nadogradnju"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Preuzimanje nije uspjelo"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Preuzimanje nadogradnje nije uspjelo. Vjerovatno je problem u mreži. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Raspakiravanje nije uspjelo."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -755,11 +813,11 @@ msgstr ""
 "Raspakiravanje nadogradnje nije uspjelo. Vjerovatno je problem u mreži ili "
 "na poslužitelju. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Provjera nije uspjela"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -767,11 +825,11 @@ msgstr ""
 "Provjera nadogradnje nije uspjela. Vjerovatno je problem u mreži ili sa "
 "poslužiteljem. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autorizacija nije uspjela"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -789,18 +847,18 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -808,12 +866,40 @@ msgstr ""
 "Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet "
 "vezu."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Nadogradi na zadnju verziju Ubuntua"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Instaliraj nadogradnje"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Ne mogu instalirati sve dostupne nadogradnje"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -824,30 +910,61 @@ msgstr ""
 "upišite \"sudo apt-get dist-upgrade\" u terminalu za potpunu nadogradnju "
 "vašeg sistema."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Slijedeći paketi će biti preskočeni:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verzija %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Preuzimam popis promjena..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Veličina preuzimanja: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Vaš sustav sadrži posljednje nadogradnje"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -855,24 +972,35 @@ msgstr[0] "Možete instalirati %s nadogradnju"
 msgstr[1] "Možete instalirati %s nadogradnje"
 msgstr[2] "Možete instalirati %s nadogradnji"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Molim pričekajte, ovo može potrajati."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Nadogradnja je gotova"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nova verzija: %s (Veličina: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Verzija %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Vaša distibucija više nije podržana"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -882,17 +1010,17 @@ msgstr ""
 "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više "
 "detalja o nadogradnji."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Popis programa je oštećen"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1013,11 +1141,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet nadogradnje</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet nadogradnje</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1261,178 +1390,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Održavani od strane zajednice (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Neslobodni (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Neslobodni (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Instaliraj nadogradnje"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Službeno podržani"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 osvježenja"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 backporti"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 osvježenja"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 backporti"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Održavani od strane zajednice (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Neslobodni (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Službeno podržani"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Ograničeno autorsko pravo"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 osvježenja"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 backporti"
@@ -1483,6 +1618,18 @@ msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-nekompatibilni programi"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Otprilike je ostalo %li sekundi"
+
+#~ msgid "Download is complete"
+#~ msgstr "Preuzimanje je završeno"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Nadogradnja se prekida. Molim, prijavite ovaj bug."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Nadograđujem Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Sakrij detalje"
 
diff --git a/po/hu.po b/po/hu.po
index 751d60e4..c66d7cc6 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-28 21:22+0000\n"
 "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Szoftverfrissítések"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Kérem, adja meg a lemez nevét"
 msgid "Please insert a disc in the drive:"
 msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -152,33 +152,36 @@ msgstr ""
 "javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-get "
 "segítségével."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "A szükséges meta-csomagok nem frissíthetőek"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Egy alapvető csomag eltávolításra kerülne"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Nem tudom megtervezni a frissítés menetét"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "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:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Hiba történt néhány csomag hitelesítése közben"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,23 +191,23 @@ msgstr ""
 "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi "
 "lista a hitelesíthetetlen csomagokat tartalmazza."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' nem telepíthető"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Nem tudom megállapítani a meta-csomagot"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +221,42 @@ msgstr ""
 " Kérem, előbb telepítse a fenti csomagok egyikét a synaptic vagy az apt-get "
 "használatával."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "A letöltés meghiúsult"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Gyorsítótár beolvasása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "nem található érvényes tükör"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -247,11 +277,11 @@ msgstr ""
 "A \"Nem\" kiválasztása megszakítja a frissítést."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Alapértelmezett források ismételt előállítása?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -265,11 +295,11 @@ msgstr ""
 "Kíván alapértelmezett bejegyzéseket adni a következőhöz: %s? Ha a Nem "
 "gombott választja, a frissítés félbeszakad."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Érvénytelen csomagtároló információ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -277,11 +307,11 @@ msgstr ""
 "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, "
 "jelentse ezt hibaként."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "A külső források letiltva"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -291,11 +321,11 @@ msgstr ""
 "a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic "
 "csomagkezelővel."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Hiba történt a frissítés közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -303,11 +333,11 @@ msgstr ""
 "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. "
 "Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Nincs elég szabad hely a merevlemezen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -319,27 +349,31 @@ msgstr ""
 "fájljait a \"sudo apt-get clean\" parancs kiadásával."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Biztosan el szeretné kezdeni a frissítést?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "A frissítések nem telepíthetők"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan "
 "állapotban van. Egy helyreállítás került futtatásra (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "A frissítések nem tölthetők le"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -347,11 +381,11 @@ msgstr ""
 "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy "
 "a telepítő médiát és próbálja újra. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Néhány szoftver már nincs hivatalosan támogatva"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -365,23 +399,23 @@ msgstr ""
 "Ha nincs engedélyezve a \"universe\" tároló, akkor ezek a csomagok a "
 "következő lépésben ki lesznek jelölve eltávolításra. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Eltávolítja az elavult csomagokat?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "Ezen lé_pés kihagyása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Hiba a módosítások rögzítése közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -390,110 +424,101 @@ msgstr ""
 "információkat tartalmaz a hibára vonatkozóan. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "A rendszer eredeti állapotának helyreállítása"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Csomagkezelő ellenőrzése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Csomagtároló információ frissítése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Érvénytelen csomaginformációk"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "A csomaginformációk frissítése után a(z) \"%s\" alapvető csomag nem "
 "található többé.\n"
 "Ez egy komoly problémát jelez, jelentse hibaként."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Megerősítés kérése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Frissítés folyamatban"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Elavult szoftverek keresése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "A rendszer frissítése befejeződött."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Kb. %li nap, %li óra és %li perc van hátra"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Kb. %li óra és %li perc van hátra"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Kb. %li perc van hátra"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Kb. %li másodperc van hátra"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Helyezze be a következő médiát: '%s', ebbe a meghajtóba: '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "A letöltés befejeződött"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "A frissítés befejeződött"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Kb. %li perc van hátra"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Fájl letöltése: %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Módosítások alkalmazása..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s' nem telepíthető"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "A frissítés félbeszakadt. Kérem, jelentse ezt hibaként."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -503,18 +528,20 @@ msgstr ""
 "\"%s\"\n"
 "konfigurációs fájlt?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "A 'diff' parancs nem található"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Végzetes hiba történt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Kérem, jelentse ezt hibaként és a hibajelentéshez mellékelje a /var/log/dist-"
@@ -525,71 +552,105 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s csomag el lesz távolítva."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s új csomag kerül telepítésre."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s csomag frissítve lesz."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Összes letöltendő adatmennyiség: %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet "
 "bármikor megszakítani."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Nincs elérhető frissítés"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Az Ön rendszere már frissítve lett."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s eltávolítása</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s telepítése"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s frissítése"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Kb. %li nap, %li óra és %li perc van hátra"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Kb. %li óra és %li perc van hátra"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Újraindítás szükséges"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -645,7 +706,8 @@ msgid "Difference between the files"
 msgstr "Fájlok közti különbség"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Frissítések letöltése és telepítése"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -665,26 +727,22 @@ msgid "Terminal"
 msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Az Ubuntu frissítése"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Megtartás"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Csere"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Hibabejelentés"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "Újrain_dítás most"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "Frissítés _folytatása"
 
@@ -705,47 +763,47 @@ msgid "Please check your internet connection."
 msgstr "Kérjük ellenőrizze az internetkapcsolatát."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Nem sikerült futtatni a frissítőeszközt"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Feltehetőleg ez egy hiba a frissítőeszközben. Kérem, jelentse ezt hibaként."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Frissítőeszköz letöltése"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "A frissítőeszköz végigvezeti Önt a frissítési folyamaton."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Frissítőeszköz aláírása"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Frissítőeszköz"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "A letöltés meghiúsult"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "A frissítés letöltése meghiúsult. Lehetséges, hogy hálózati probléma áll "
 "fenn. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "A kibontás meghiúsult"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -753,11 +811,11 @@ msgstr ""
 "A frissítés kibontása meghiúsult. Probléma lehet a hálózattal vagy a "
 "kiszolgálóval. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Az ellenőrzés meghiúsult"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -765,11 +823,11 @@ msgstr ""
 "A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a "
 "kiszolgálóval. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -787,16 +845,16 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "A módosítások listája még nem érhető el. Próbálkozzon később."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "A módosítások listája még nem érhető el. Próbálkozzon később."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -804,12 +862,40 @@ msgstr ""
 "A módosítások listájának letöltése meghiúsult. Ellenőrizze az "
 "internetkapcsolatát."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 biztonsági frissítések"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Frissítés az Ubuntu legújabb változatára"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Telepítés"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Nem telepíthető minden rendelkezésre álló frissítés"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -820,53 +906,95 @@ msgstr ""
 "futtassa terminálból a \"sudo apt-get dist-upgrade\" parancsot a rendszer "
 "teljes frissítéshez."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "A következő frissítések ki lesznek hagyva:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "%s verzió: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Módosítások listájának letöltése..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Letöltés mérete: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "A rendszere naprakész"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "%s frissítést telepíthet"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Kis türelmet, ez eltarthat egy ideig."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "A frissítés befejeződött"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Új verzió: %s (Méret: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "%s verzió: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "A terjesztés már nem támogatott"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -876,17 +1004,17 @@ msgstr ""
 "Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel kapcsolatos "
 "információkat az http://www.ubuntu.com weboldalon talál."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "A szoftverindex sérült"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1009,11 +1137,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Hálózati frissítések</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Hálózati frissítések</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1258,178 +1387,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Közösségi karbantartású (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Nem-szabad (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Nem-szabad (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 biztonsági frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Telepítés"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Hivatalosan támogatott"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 biztonsági frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 visszaportolt csomagok"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 biztonsági frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 visszaportolt csomagok"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Közösségi karbantartású (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Nem-szabad (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Hivatalosan támogatott"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Szerzői jogi korlátozás alatt"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 biztonsági frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 frissítések"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 visszaportolt csomagok"
@@ -1480,6 +1615,18 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
 msgid "Non-DFSG-compatible Software"
 msgstr "Nem DFSG-kompatibilis szoftver"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Kb. %li másodperc van hátra"
+
+#~ msgid "Download is complete"
+#~ msgstr "A letöltés befejeződött"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "A frissítés félbeszakadt. Kérem, jelentse ezt hibaként."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Az Ubuntu frissítése"
+
 #~ msgid "Hide details"
 #~ msgstr "Részletek elrejtése"
 
diff --git a/po/id.po b/po/id.po
index 9c376c9c..1db79502 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-28 18:46+0000\n"
 "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,26 +75,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Perangkat Lunak Mutakhir"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Silakan masukkan nama untuk cakram"
 msgid "Please insert a disc in the drive:"
 msgstr "Silakan masukan cakram ke dalam penggerak"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Paket rusak"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -152,33 +152,36 @@ msgstr ""
 "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan "
 "synaptic atau apt-get sebelum melanjutkan hal ini."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Paket esensial akan dihapus"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Tidak dapat menghitung pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Terjadi masalah saat menghitung pemutakhiran. Silakan laporkan ini sebagai "
 "bug. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Kesalahan membuktikan keabsahan beberapa paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,12 +191,12 @@ msgstr ""
 "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat "
 "lagi. Lihat senarai dari paket yang belum terbukti keabsahnya dibawah ini."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Tidak dapat menginstal '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -202,11 +205,11 @@ msgstr ""
 "ini sebagai bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Tidak dapat menebak meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -220,15 +223,42 @@ msgstr ""
 " Silakan instal dahulu salah satu paket di atas dengan menggunakan synaptic "
 "atau apt-get sebelum melanjutkan."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Gagal untuk fetch"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Membaca cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Tidak menemukan mirror yang valid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -248,11 +278,11 @@ msgstr ""
 "Jika anda pilih 'no' pemutakhiran akan dibatalkan."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Membuat sumber baku?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -265,11 +295,11 @@ msgstr ""
 "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' "
 "pemutakhiran akan dibatalkan."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Informasi gudang tidak valid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -277,11 +307,11 @@ msgstr ""
 "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. "
 "Silakan laporkan ini sebagai bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Sumber dari pihak ketiga dilumpukan"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -291,11 +321,11 @@ msgstr ""
 "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' "
 "atau dengan synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Kesalahan pada waktu pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -303,11 +333,11 @@ msgstr ""
 "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah "
 "jaringan, silakan periksa koneksi jaringan anda dan ulangi."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Kapasitas cakram tidak mencukupi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -319,27 +349,31 @@ msgstr ""
 "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Apakah anda ingin memulai pemutakhiran?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Tidak dapat menginstal pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat "
 "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Tidak dapat mengunduh pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -347,11 +381,11 @@ msgstr ""
 "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau "
 "media instalasi dan coba lagi nanti. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Beberapa perangkat lunak tidak lagi resmi disokong"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -365,23 +399,23 @@ msgstr ""
 "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan "
 "untuk penghapusan dalam langkah selanjutnya. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Hapus paket usang?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Lewati Langkah Ini"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Kesalahan pada waktu commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -390,111 +424,102 @@ msgstr ""
 "bawah untuk informasi lebih lanjut. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Sistem dikembalikan ke keadaan awal"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Memeriksa manajer paket"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Memutakhirkan informasi gudang"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Informasi paket tidak valid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Setelah informasi paket anda dimutakhirkan paket penting '%s' tidak dapat "
 "ditemukan lagi.\n"
 "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai "
 "bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Menanyakan konfigurasi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Meng-upgrade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Mencari perangkat lunak usang"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Upgrade sistem telah selesai."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Sekitar %li hari %li jam %li menit lagi"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Sekitar %li jam %li menit lagi"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Sekitar %li menit lagi"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Sekitar %li detik lagi"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Silakan masukkan '%s' ke dalam penggerak '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Unduh telah selesai"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Pemutakhiran selesai"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Mengunduh berkas %li dari %li pada %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Sekitar %li menit lagi"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Mengunduh berkas %li dari %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Sahkan perubahan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Tidak dapat instal '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Upgrade sekarang dibatalkan. Silakan laporkan bug ini."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -503,18 +528,20 @@ msgstr ""
 "Mengganti berkas konfigurasi\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Perintah 'diff' tidak dapat ditemukan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Terjadi kesalahan fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Silakan laporkan ini sebagai bug dan sertakan berkas /var/log/dist-upgrade."
@@ -524,70 +551,104 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s paket akan dihapus."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s paket baru akan diinstal."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s paket akan diupgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Anda harus mengunduh sebanyak %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Upgrade membutuhkan waktu beberapa jam dan tidak dapat dibatalkan setelah "
 "itu."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Tidak dapat menemukan upgrade apapun"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Sistem anda telah diupgrade"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Hapus %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instal %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Upgrade %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Sekitar %li hari %li jam %li menit lagi"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Sekitar %li jam %li menit lagi"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Diperlukan reboot"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -642,7 +703,8 @@ msgid "Difference between the files"
 msgstr "Perbedaan diantara berkas"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Mengunduh dan menginstal upgrade"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -662,26 +724,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Mengupgrade Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Simpan"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Ganti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Laporkan Bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Mulai Ulang Sekarang"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Lanjutkan Upgrade"
 
@@ -702,45 +760,45 @@ msgid "Please check your internet connection."
 msgstr "Silakan periksa koneksi internet anda."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Tidak dapat menjalankan alat upgrade"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Sepertinya ada bug dalam peralatan upgrade. Silakan laporkan ini sebagai bug"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Mengunduh peralatan upgrade"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Peralatan upgrade akan memandu anda untuk melalui proses upgrade."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Tanda tangan peralatan upgrade"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Peralatan upgrade"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Gagal untuk fetch"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Gagal meng-fetch upgrade. Terjadi masalah pada jaringan. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Gagal mengekstrak"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -748,11 +806,11 @@ msgstr ""
 "Gagal mengekstrak upgrade. Mungkin terjadi masalah dengan jaringan atau "
 "dengan server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verifikasi gagal"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -760,11 +818,11 @@ msgstr ""
 "Gagal memeriksa upgrade. Mungkin terjadi masalah dengan jaringan atau dengan "
 "server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Otentikasi gagal"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -782,16 +840,16 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -799,12 +857,40 @@ msgstr ""
 "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet "
 "anda."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Pemutakhiran lewat Internet"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Upgrade ke versi Ubuntu terakhir"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Instal Update"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -815,53 +901,95 @@ msgstr ""
 "jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk memutakhirkan "
 "sistem anda."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Pemutakhiran berikut akan dilewati:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versi %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Mengunduh senarai dari perubahan..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Ukuran unduh: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Sistem anda telah up-to-date"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Anda dapat instal %s pemutakhiran"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Pemutakhiran selesai"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Versi baru: %s   (Ukuran: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versi %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Distribusi anda tidak disokong lagi"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -871,17 +999,17 @@ msgstr ""
 "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www."
 "ubuntu.com untuk informasi lebih lanjut."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Indeks perangkat lunak telah rusak"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1003,11 +1131,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet update</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet update</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1251,177 +1380,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Pemutakhiran lewat Internet"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Instal Update"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Resmi disokong"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 6.06 LTS Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 6.06 LTS Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Resmi disokong"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Hak cipta terlarang"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 6.06 LTS Backports"
@@ -1474,6 +1609,18 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Sekitar %li detik lagi"
+
+#~ msgid "Download is complete"
+#~ msgstr "Unduh telah selesai"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Upgrade sekarang dibatalkan. Silakan laporkan bug ini."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Mengupgrade Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Sembunyikan perincian"
 
diff --git a/po/it.po b/po/it.po
index c8834742..37465507 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 14:01+0000\n"
 "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Aggiornamenti Software"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Sorgente"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Sorgente"
@@ -145,11 +145,11 @@ msgstr "Inserire un nome per il disco"
 msgid "Please insert a disc in the drive:"
 msgstr "Inserire un disco nell'unità:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Pacchetti non integri"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -158,33 +158,36 @@ msgstr ""
 "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get"
 "\" per risolvere il probelma."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Impossibile aggiornare i meta-pacchetti richiesti"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Un pacchetto essenziale dovrebbe essere rimosso"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Impossibile calcolare l'aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Si è verificato un problema irrisolvibile durante il calcolo "
 "dell'aggiornamento. Notificare questo evento come bug. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Errore nell'autenticare alcuni pacchetti"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -194,12 +197,12 @@ msgstr ""
 "un problema di rete passeggero, riprovare più tardi. Segue una lista di "
 "pacchetti non autenticati."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossibile installare \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -208,11 +211,11 @@ msgstr ""
 "evento come bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Impossibile indovinare il meta-pacchetto"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -226,15 +229,42 @@ msgstr ""
 " Prima di procedere, usare synaptic o apt-get per installare uno dei "
 "pacchetti sopra menzionati."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Prelievo fallito"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Lettura della cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Non è stato trovato alcun mirror valido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -255,11 +285,11 @@ msgstr ""
 "Scegliendo di no, l'aggiornamento verrà annullato."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Generare le sorgenti predefinite?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -273,11 +303,11 @@ msgstr ""
 "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento "
 "verrà annullato."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Informazioni sul repository non valide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -285,11 +315,11 @@ msgstr ""
 "L'aggiornamento delle informazioni sul repository ha generato un file non "
 "valido. Notificare questo evento come bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Sorgenti di terze parti disabilitate"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -299,11 +329,11 @@ msgstr ""
 "list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo "
 "strumento «software-properties» o con synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Errore durante l'aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -311,11 +341,11 @@ msgstr ""
 "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta "
 "di problemi di rete, controllare la connessione di rete e riprovare."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Spazio libero su disco insufficiente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -327,28 +357,32 @@ msgstr ""
 "usando \"sudo apt-get clean\"."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Iniziare l'aggiornamento?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Impossibile installare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Interruzione immediata dell'aggiornamento. Il sistema potrebbe trovarsi in "
 "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -"
 "a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Impossibile scaricare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -356,11 +390,11 @@ msgstr ""
 "Interruzione immediata dell'aggiornamento. Controllare la connessione a "
 "internet o il supporto di installazione e riprovare. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Software non più supportato ufficialmente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -375,23 +409,23 @@ msgstr ""
 "Se non è abilitato il repository «universe», verrà suggerita la rimozione di "
 "questi pacchetti al prossimo passo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Rimuovere i pacchetti obsoleti?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Salta questo passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Errore durante il commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -400,111 +434,101 @@ msgstr ""
 "seguente per maggiori informazioni. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Ripristino stato originale del sistema"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Controllo gestore dei pacchetti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Aggiornamento delle informazione sui repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Informazioni di pacchetto non valide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Dopo l'aggiornamento delle di pacchetto informazioni non è più possibile "
 "trovare il pacchetto essenziale «%s».\n"
 "Ciò indica un errore grave, segnalare questo evento come un bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Richiesta di conferma"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Ricerca di software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "L'aggiornamento del sistema è stato completato."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Circa %li giorni, %li ore e %li minuti rimanenti"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Circa %li ore e %li minuti rimanenti"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Circa %li minuti rimanenti"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Circa %li secondi rimanenti"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Inserire \"%s\" nell'unità \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Scaricamento completato"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Aggiornamento completato"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Scaricamento del file %li di %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Circa %li minuti rimanenti"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Scaricamento del file %li di %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Applicazione dei cambiamenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Impossibile installare \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Interruzione immediata dell'aggiornamento. Notificare questo evento come bug."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -513,18 +537,20 @@ msgstr ""
 "Sostituire il file di configurazione\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Il comando \"diff\" non è stato trovato"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Si è verificato un errore fatale"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Segnalare questo evento come un bug e includere nella notifica i file /var/"
@@ -535,74 +561,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pacchetto sta per essere rimosso."
 msgstr[1] "%s pacchetti stanno per essere rimossi."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s nuovo pacchetto sta per essere installato."
 msgstr[1] "%s nuovi pacchetti stanno per essere installati."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pacchetto sta per essere aggiornato."
 msgstr[1] "%s pacchetti stanno per essere aggiornati."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "È necessario scaricare un totale di %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "L'aggiornamento può richiedere diverse ore e non può essere annullato in "
 "nessun momento successivo."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Impossibile trovare aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Il sistema è già stato aggiornato."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Rimuovere %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Installare %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Aggiornare %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Circa %li giorni, %li ore e %li minuti rimanenti"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Circa %li ore e %li minuti rimanenti"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Riavvio richiesto"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?"
@@ -655,7 +715,8 @@ msgid "Difference between the files"
 msgstr "Differenze tra i file"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Scaricamento e installazione degli aggiornamenti"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -675,26 +736,22 @@ msgid "Terminal"
 msgstr "Terminale"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Aggiornamento di Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Mantieni"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Notifica bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Riavvia ora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Riprendi aggiornamento"
 
@@ -715,50 +772,50 @@ msgid "Please check your internet connection."
 msgstr "Controllare la propria connessione a internet."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Impossibile eseguire lo strumento di aggiornamento"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Questo potrebbe essere un bug nello strumento per l'aggiornamento. "
 "Notificare questo evento come un bug."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Scaricamento dello strumento di aggiornamento"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 "Lo strumento di aggiornamento vi guiderà durante il processo di "
 "aggiornamento."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Firma dello strumento di aggiornamento"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Strumento di aggiornamento"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Prelievo fallito"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Fallito il prelievo dell'aggiornamento. Potrebbe dipendere da un problema di "
 "rete. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Estrazione fallita"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -766,11 +823,11 @@ msgstr ""
 "Fallita l'estrazione dell'aggiornamento. Potrebbe dipendere da un problema "
 "con la connesione di rete o con il server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verifica fallita"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -778,11 +835,11 @@ msgstr ""
 "Fallita la verifica dell'aggiornamento. Potrebbe dipendere da un problema "
 "con la connessione di rete o con il server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autenticazione fallita"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -800,18 +857,18 @@ msgstr "Scaricamento del file %li di %li a %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Scaricamento del file %li di %li a velocità sconosciuta"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -819,12 +876,40 @@ msgstr ""
 "Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la "
 "connessione ad Internet."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Aggiorna all'ultima versione di Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Installazione degli aggiornamenti"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Impossibile installare tutti gli aggiornamenti disponibili"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -835,54 +920,96 @@ msgstr ""
 "\"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade\" in un "
 "terminale per aggiornare completamente il sistema."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "I seguenti aggiornamenti saranno tralasciati:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versione %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Scaricamento dell'elenco dei cambiamenti..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Dati da scaricare: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Il sistema è aggiornato!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "È possibile installare %s aggiornamento"
 msgstr[1] "È possibile installare %s aggiornamenti"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Attendere, l'operazione potrebbere richiedere del tempo."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Aggiornamento completato"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nuova versione: %s (Dimensione: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versione %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "La distribuzione in uso non è più supportata"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -892,17 +1019,17 @@ msgstr ""
 "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni "
 "consultare http://www.ubuntu.com"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "L'indice dei programmi è rovinato"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1024,11 +1151,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Aggiornamenti internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Aggiornamenti internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1279,177 +1407,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Mantenuto dalla comunità (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non libero (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non libero (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Installazione degli aggiornamenti"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Supportato ufficialmente"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aggiornamenti di Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backport di Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Aggiornamenti di Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backport di Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Mantenuto dalla comunità (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non libero (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Supportato ufficialmente"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Copyright con restrizioni"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aggiornamenti di Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backport di Ubuntu 5.10"
@@ -1500,6 +1634,20 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Circa %li secondi rimanenti"
+
+#~ msgid "Download is complete"
+#~ msgstr "Scaricamento completato"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "Interruzione immediata dell'aggiornamento. Notificare questo evento come "
+#~ "bug."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Aggiornamento di Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Nascondi dettagli"
 
diff --git a/po/ja.po b/po/ja.po
index b26d511a..393fac1d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.4\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 07:06+0000\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "ソフトウェアのアップデート"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "ソース"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "ソース"
@@ -142,11 +142,11 @@ msgstr "ディスク名を入力してください"
 msgid "Please insert a disc in the drive:"
 msgstr "ディスクをドライブに挿入してください:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -154,31 +154,34 @@ msgstr ""
 "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま"
 "す。 Synaptic や apt-get を使って最初に修正してください。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "要求されたメタパッケージがアップグレードできません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "必須パッケージが削除されます"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "アップグレードが算定できません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "いくつかのパッケージが認証されませんでした"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,12 +191,12 @@ msgstr ""
 "クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー"
 "ジが表示されます。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' がインストールできません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -201,11 +204,11 @@ msgstr ""
 "要求されたパッケージのインストールができません。バグとして報告してください。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "メタパッケージを推測できません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -219,15 +222,42 @@ msgstr ""
 "開始前に Synaptic や apt-get を使用して上記のパッケージのうちのひとつをインス"
 "トールしてください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "取得に失敗しました"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "キャッシュを読み込み中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "正しいミラーが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -246,11 +276,11 @@ msgstr ""
 "キャンセルします。"
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "標準のソースを生成しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -263,11 +293,11 @@ msgstr ""
 "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを"
 "キャンセルします。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "リポジトリ情報が無効です"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -275,11 +305,11 @@ msgstr ""
 "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報"
 "告してください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "公式ではないソースが無効になりました"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -289,11 +319,11 @@ msgstr ""
 "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく"
 "ださい。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "アップデート中にエラー発生"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -301,11 +331,11 @@ msgstr ""
 "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。"
 "ネットワーク接続をチェックし、再びアップデートしてください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "ディスクの空き領域が足りません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -317,27 +347,31 @@ msgstr ""
 "た一時パッケージを削除してください。"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "アップグレードを開始しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "アップグレードをインストールできません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "アップグレードを中断しました。システムが使用できない状態になっている可能性が"
 "あります。ただいま修正を実行中です (dpkg --configure -a)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "アップグレードをダウンロードできません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -345,11 +379,11 @@ msgstr ""
 "アップグレードを中断しました。インターネット接続またはインストールメディア"
 "(CD-ROMなど)をチェックし。再試行してください。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "いくつかのソフトウェアはもう公式にサポートされません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -363,23 +397,23 @@ msgstr ""
 "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを"
 "提案します。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "不要なパッケージを削除しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "このステップをスキップ(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "コミット中にエラー"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -388,109 +422,100 @@ msgstr ""
 "ください。 "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "システムを元に戻し中"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "パッケージマネージャをチェック中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "リポジトリ情報をアップデート"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "無効なパッケージ情報"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n"
 "このメッセージは深刻なエラーです。バグとして報告してください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "確認する"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "アップグレード中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "古いソフトウェアを検索する"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "システムのアップグレードが完了しました。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "およそ残り %li 日 %li 時間 %li 分"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "およそ残り %li 時間 %li 分"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "およそ残り %li 分"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "およそ残り %li 秒"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "ドライブ '%s' に'%s' を挿入してください"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "ダウンロードが完了しました"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "アップデートが完了しました"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "およそ残り %li 分"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "%i のうち %i をダウンロード中"
 
 #. 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "変更を適用中"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s' がインストールできません"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "アップグレードが中断しました。不具合を報告してください。"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -499,18 +524,20 @@ msgstr ""
 "設定ファイル %s\n"
 "を置き換えますか？"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "'diff' コマンドが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "重大なエラーが発生しました"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "~/dist-upgrade.log と ~/dist-upgrade-apt.log を含めて不具合として報告してくだ"
@@ -520,69 +547,103 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s つのパッケージが削除されます。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s·つのパッケージがインストールされます。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s·つのパッケージがアップグレードされます。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "全部で %s つのパッケージをダウンロードする必要があります。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "アップグレードには数時間かかり、今後一切キャンセルはできません。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ"
 "さい。"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "アップグレードが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "システムはすでに最新の状態です。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>削除されるパッケージ: %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "インストール %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "アップグレード %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "およそ残り %li 日 %li 時間 %li 分"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "およそ残り %li 時間 %li 分"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "再起動してください"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "アップグレードが終了しました。再起動が必要ですが、すぐに実行しますか？"
@@ -637,7 +698,8 @@ msgid "Difference between the files"
 msgstr "ファイル間の違いを表示"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "アップグレードをダウンロードし、インストール"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -657,26 +719,22 @@ msgid "Terminal"
 msgstr "端末"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Ubuntu のアップグレード中"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "そのまま(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "置き換える(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "バグを報告する(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "すぐに再起動(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "アップグレードを再開する(_R)"
 
@@ -697,44 +755,44 @@ msgid "Please check your internet connection."
 msgstr "インターネット接続を確認してください。"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "アップグレードツールを実行できません"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "これはおそらくアップグレードツールのバグです。報告してください。"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "アップグレードツールをダウンロード"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "アップグレードツールはアップグレードの状況をガイドします。"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "アップグレードツールの署名"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "アップグレード ツール"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "取得に失敗しました"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "アップグレードの取得に失敗しました。おそらくネットワークの問題です。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "抽出に失敗しました"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -742,11 +800,11 @@ msgstr ""
 "アップグレードの抽出に失敗しました。おそらくネットワークまたはサーバの問題で"
 "す。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "検証に失敗しました"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -754,11 +812,11 @@ msgstr ""
 "アップグレードの検証に失敗しました。おそらくネットワークまたはサーバの問題で"
 "す。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -776,16 +834,16 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "ダウンロード中: 速度不明で %li のうち %li"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "変更点がまだ取得できません。あとで試してください。"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "変更点がまだ取得できません。あとで試してください。"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -793,12 +851,40 @@ msgstr ""
 "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
 "い。"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 セキュリティアップデート"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Ubuntu の最新バージョンにアップグレード"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "アップデートをインストール中"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "すべてのアップデートをインストールすることができません"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -809,53 +895,95 @@ msgstr ""
 "ドににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を実行して"
 "ください。"
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "これらのパッケージはアップグレードされません:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "バージョン %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "変更点を取得中..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "ダウンロードサイズ: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "システムは最新の状態です!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "%s 個のアップデートがインストールされます"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "しばらくお待ちください。少々時間がかかります。"
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "アップデートが完了しました"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "新しいバージョン: %s (サイズ: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "バージョン %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "このディストリビューションはすでにサポート対象外です"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -865,17 +993,17 @@ msgstr ""
 "Ubuntu Linux にアップグレードしてください。\r\n"
 "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "ソフトウェアのインデックスが壊れています"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -997,11 +1125,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>インターネットアップデート</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>インターネットアップデート</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1246,177 +1375,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "コミュニティによるメンテナンス (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "非フリー (Multiuniverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "非フリー (Multiuniverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "アップデートをインストール中"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu·5.10·'Breezy·Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "公式サポート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu·5.10·'Breezy·Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 アップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 バックポート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 アップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 バックポート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu·5.10·'Breezy·Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "コミュニティによるメンテナンス (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "非フリー (Multiuniverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "公式サポート"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "限定的な著作権(Restricted)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 セキュリティアップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 アップデート"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 バックポート"
@@ -1467,6 +1602,18 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSGに適合しないソフトウェア"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "およそ残り %li 秒"
+
+#~ msgid "Download is complete"
+#~ msgstr "ダウンロードが完了しました"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "アップグレードが中断しました。不具合を報告してください。"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Ubuntu のアップグレード中"
+
 #~ msgid "Hide details"
 #~ msgstr "詳細を隠す"
 
diff --git a/po/ka.po b/po/ka.po
index 58abf1cf..244859fd 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:19+0000\n"
 "Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n"
 "Language-Team: Georgian <geognome@googlegroups.com>\n"
@@ -69,7 +69,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -78,26 +78,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "პროგრამული განახლებები"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -143,11 +143,11 @@ msgstr "შეიყვანეთ დისკის სახელი"
 msgid "Please insert a disc in the drive:"
 msgstr "მოათავსეთ დისკი დისკწამყვანში:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "გაფუჭებული პაკეტები"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -156,35 +156,38 @@ msgstr ""
 "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და "
 "შემდეგ გააგრძელეთ."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 #, fuzzy
 msgid "A essential package would have to be removed"
 msgstr "A არსებითი -სკენ"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 #, fuzzy
 msgid "Could not calculate the upgrade"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "მოხდა დაუდგენელი შეცდომა განახლების დათვლისას. შეატყობინეთ ეს როგორხ "
 "ხარვეზი. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -194,23 +197,23 @@ msgstr ""
 "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-"
 "ავთენთიფიცერული პაკეტების სია."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' ვერ დაყენდა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "მეტა-პაკეტი ვერ გამოვიცანით"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -222,15 +225,42 @@ msgstr ""
 "არა შეიცავს a ან და არა -სკენ ვერსია ის\n"
 " ის ან."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "ვერ განხორციელდა -სკენ"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "მიმდინარეობს ქეშის წაკითხვა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -243,12 +273,12 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 #, fuzzy
 msgid "Generate default sources?"
 msgstr "გენერაცია ნაგულისხმევი?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -257,11 +287,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "რეპოზიტორიების ინფორმაცია არასწორეა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -269,12 +299,12 @@ msgstr ""
 "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ "
 "ხარვეზი."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 #, fuzzy
 msgid "Third party sources disabled"
 msgstr "გამორთული"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 #, fuzzy
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
@@ -282,11 +312,11 @@ msgid ""
 "synaptic."
 msgstr "-ში სია გამორთული თქვენ პარამეტრები ან."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "განახლებისას მოხდა შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -294,11 +324,11 @@ msgstr ""
 "განახლებისას მოხდა შეცდომა. ეს როგროც წესი არის კავშირის პრობლემა, შეამოწმეთ "
 "თქვენი კავშირი და ცადეთ კიდევ ერთხელ."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -307,40 +337,43 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "გნებავთ განახლების დაწყება?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 #, fuzzy
 msgid "Could not install the upgrades"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 #, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "ახლა -ში A a."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 #, fuzzy
 msgid "Could not download the upgrades"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "ახლა ან და "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 #, fuzzy
 msgid "Some software no longer officially supported"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 #, fuzzy
 msgid ""
 "These installed packages are no longer officially supported, and are now "
@@ -350,24 +383,24 @@ msgid ""
 "removal in the next step. "
 msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "წავშალო მოძველებული პაკეტები?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "ნაბიჯის გა_მოტოვება"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_წაშლა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 #, fuzzy
 msgid "Error during commit"
 msgstr "შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 #, fuzzy
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
@@ -375,201 +408,224 @@ msgid ""
 msgstr "-თვის ინფორმაცია "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "ვამოწმებ პროგრამულ მენეჯერს"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "რეპოზტორიის ინფორმაციის განახლება"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "-თვის"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "მიმდინარეობს განახლებების ჩაყენება"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 #, fuzzy
 msgid "Searching for obsolete software"
 msgstr "ვეძებ -თვის"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 #, fuzzy
 msgid "System upgrade is complete."
 msgstr "სისტემა ტოლია სრული."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
 #, fuzzy
-msgid "Download is complete"
-msgstr "ჩამოტვირთვა ტოლია სრული"
+msgid "Fetching is complete"
+msgstr "განახლება გასრულებულია"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "ცვლილებების დამტკიცება"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "ვერ ჩავდგი '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "ახლა."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 #, fuzzy
 msgid "The 'diff' command was not found"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 #, fuzzy
 msgid "A fatal error occured"
 msgstr "A შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 #, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr "a და შემცველობა და -ში ახლა თავდაპირველი სია -ში სია."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 #, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "საათი და ნებისმიერი დრო."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 #, fuzzy
 msgid "To prevent data loss close all open applications and documents."
 msgstr "ვის დახურვა ყველა გახსნა და დოკუმენტები."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "ვერ ვპოულობ განახლებებს"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "თქვენი სისტემა სულ ახლახანს განახლდა."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b> ამოშლა %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "დაყენება %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "ჩასაყენებელი განახლება %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "საჭიროა გადატვირთვა"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 #, fuzzy
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
@@ -623,7 +679,7 @@ msgstr "განსხვავება"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 #, fuzzy
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr "მიმდინარეობს ჩამოქაჩვა და"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -644,26 +700,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_ჩაანაცვლე"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_შეცდომის-ოქმის გაგავნა"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_მყისვე გადატვირთვა"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "განახლება _გაგრძელება"
 
@@ -684,73 +736,73 @@ msgid "Please check your internet connection."
 msgstr "გთხოვთ შეამოწმოთ თქვენი ინტერნეტ კავშირი."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "ვერ ვრთავ განახლების ჩადგმის ხელსაწყოს"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "ტოლია a -ში a"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "მიმდინარეობს ჩამოქაჩვა"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 #, fuzzy
 msgid "Upgrade tool signature"
 msgstr "განახლება"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "განახლების ჩაყენების ხელსაწყო"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 #, fuzzy
 msgid "Failed to fetch"
 msgstr "ვერ განხორციელდა -სკენ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 #, fuzzy
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "ვერ შედგა a "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "ამოარქივება ვერ განხორციელდა"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 #, fuzzy
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr "ამოღება ვერ შედგა a ან "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 #, fuzzy
 msgid "Verfication failed"
 msgstr "ვერ შედგა"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 #, fuzzy
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr "ვერ შედგა a ან "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "იდენთიფიკაციამ ჩაიშალა"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 #, fuzzy
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
@@ -767,30 +819,58 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "განახლება -სკენ ვერსია ის"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "განახლებების _დაყენება"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 #, fuzzy
 msgid ""
 "Some updates require the removal of further software. Use the function "
@@ -800,54 +880,96 @@ msgstr ""
 "ის გამოყენება მონიშვნა ყველა ის Synaptic ან sudo -ში a ტერმინალი -სკენ "
 "განახლება."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "ვერსია %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "მიმდინარეობს ჩამოქაჩვა სია ის."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "ჩამოსატვირთის ზომა: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "თქვენი სისტემა განახლებულია"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "განახლება გასრულებულია"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "ახალი ვერსია: %s   (ზომა: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "ვერსია %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 #, fuzzy
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
@@ -857,17 +979,17 @@ msgstr ""
 "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი "
 "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "პროგრამების სიის ინდექსი დაზიანებულია"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 #, fuzzy
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
@@ -989,11 +1111,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>ინტერნეტ განახლებები</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>ინტერნეტ განახლებები</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1239,177 +1362,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "არათავისუფალი (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "არათავისუფალი (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "განახლებების _დაყენება"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 განახლებები"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 განახლებები"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "არათავისუფალი (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 #, fuzzy
 msgid "Restricted copyright"
 msgstr "შეზღუდული"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 განახლებები"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
@@ -1463,6 +1592,17 @@ msgstr "პროგრამა თავისუფალი დამოკ�
 msgid "Non-DFSG-compatible Software"
 msgstr "პროგრამა"
 
+#, fuzzy
+#~ msgid "Download is complete"
+#~ msgstr "ჩამოტვირთვა ტოლია სრული"
+
+#, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "ახლა."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "მიმდინარეობს უბუნტუს განახლებების ჩაყენება"
+
 #~ msgid "Hide details"
 #~ msgstr "დეტალების დამალვა"
 
diff --git a/po/ko.po b/po/ko.po
index 31af9cb9..1637fd34 100644
--- a/po/ko.po
+++ b/po/ko.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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-28 15:14+0000\n"
 "Last-Translator: darehanl <darehanl@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "소프트웨어 업데이트"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgstr "디스크에 사용할 이름을 입력하십시오."
 msgid "Please insert a disc in the drive:"
 msgstr "드라이브에 디스크를 넣으십시오:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "망가진 꾸러미"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -150,33 +150,36 @@ msgstr ""
 "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅"
 "틱이나 apt-get을 사용하여 복구하십시오."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "필수 꾸러미를 지워야만 합니다."
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "업그레이드에 필요한 의존성을 계산하던 중 해결할 수 없는 문제가 발생했습니다. "
 "버그를 보고하여 주십시오. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "꾸러미 인증 오류"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -185,23 +188,23 @@ msgstr ""
 "인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중"
 "에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s'을(를) 설치할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "메타 꾸러미를 추측할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -214,15 +217,42 @@ msgstr ""
 " 위의 꾸러미 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니"
 "다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "가져오기가 실패했습니다."
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "캐시를 읽는 중"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "적합한 미러 서버를 찾지 못했습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -242,11 +272,11 @@ msgstr ""
 "'아니오'를 고르면 업데이트가 취소됩니다."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "기본 설정된 소스 목록을 만듭니까?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -259,11 +289,11 @@ msgstr ""
 "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 고르면 업데이트가 취소됩"
 "니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "저장소 정보가 올바르지 않습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -271,11 +301,11 @@ msgstr ""
 "저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하"
 "여 주십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "써드 파티 소스는 이용할 수 없습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -285,11 +315,11 @@ msgstr ""
 "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습"
 "니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "업데이트 중 오류"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -297,11 +327,11 @@ msgstr ""
 "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습"
 "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "디스크 여유 공간이 충분하지 않습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -313,27 +343,31 @@ msgstr ""
 "에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "업그레이드를 시작하시겠습니까?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "업그레이드를 설치하지 못했습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "업그레이드가 중지되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. "
 "(dpkg --configure -a)를 실행하여 복구하십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "업그레이드 파일을 다운로드 할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -341,11 +375,11 @@ msgstr ""
 "업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도"
 "하십시오. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -359,23 +393,23 @@ msgstr ""
 "'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 "
 "수 있습니다. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "이 단계 건너뛰기(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "삭제(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "커밋 도중 오류 발생"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -384,110 +418,101 @@ msgstr ""
 "보를 얻으실 수 있습니다. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "시스템을 원상태로 복구하는 중"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "꾸러미 관리자 확인 중"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "저장소 정보 업데이트 중"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "잘못된 꾸러미 정보"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "꾸러미 정보가 업데이트 된 후에 필수 꾸러미 '%s'를 어디에서도 찾을 수 없습니"
 "다.\n"
 "심각한 오류입니다. 버그를 보고하여 주십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "확인을 요청하는 중"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "업그레이드 하는 중"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "못 쓰게 된 소프트웨어를 검색하는 중"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "시스템 업그레이드가 끝났습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "%li 일 %li 시간 %li 분 정도 남았음"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "%li 시간 %li 분 정도 남았음"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "%li 분 정도 남았음"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "%li 초 정도 남았음"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "'%s'(을)를 드라이브 '%s'에 넣으십시오."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "다운로드가 끝났습니다."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "업데이트가 끝났습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "내려받는 중, %li의 %li 파일, 속도 %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "%li 분 정도 남았음"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "변경 사항을 적용하는 중"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s'(을)를 설치할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "업그레이드가 중지되었습니다. 버그를 보고하여 주십시오."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -496,18 +521,20 @@ msgstr ""
 "설정 파일을 바꾸시겠습니까?\n"
 "'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "'diff' 명령어를 찾지 못했습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "심각한 오류 발생"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "이것을 버그로 간주하여 /var/log/dist-upgrade.log 파일과 /var/log/dist-"
@@ -516,67 +543,101 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "꾸러미 %s 개가 삭제될 것입니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "새로운 꾸러미가 %s 개 설치될 것입니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "꾸러미가 %s 개 업그레이드 될 것입니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "총 %s개의 꾸러미를 다운로드 합니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "업그레이드는 여러 시간이 걸릴 수 있고, 어떤 때에도 취소될 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "이미 시스템이 업그레이드 되어 있습니다."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s 삭제</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s 설치"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s 업그레이드"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "%li 일 %li 시간 %li 분 정도 남았음"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "%li 시간 %li 분 정도 남았음"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "재부팅이 필요합니다."
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -631,7 +692,8 @@ msgid "Difference between the files"
 msgstr "파일의 차이점"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "업그레이드를 다운로드하고 설치하는 중"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -651,26 +713,22 @@ msgid "Terminal"
 msgstr "터미널"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "우분투를 업그레이드 하는 중"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "유지(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "바꾸기(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "버그 보고(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "지금 바로 재시작(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "업그레이드 계속(_R)"
 
@@ -691,46 +749,46 @@ msgid "Please check your internet connection."
 msgstr "인터넷 연결 상태를 확인하십시오."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "업그레이드 도구를 실행할 수 없습니다."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "업그레이드 도구에 버그가 있을 가능성이 높습니다. 버그를 보고하여 주십시오."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "업그레이드 도구를 다운로드하는 중"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "업그레이드 도구가 업그레이드 과정으로 안내할 것입니다."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "업그레이드 도구 서명"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "업그레이드 도구"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "가져오기가 실패했습니다."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "업그레이드를 가져오는데 실패했습니다. 네트워크에 문제가 있을 수 있습니다. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "압축 풀기 실패"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -738,11 +796,11 @@ msgstr ""
 "업그레이드의 압축을 푸는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있"
 "습니다. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "검사 실패"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -750,11 +808,11 @@ msgstr ""
 "업그레이드를 검사하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니"
 "다. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "인증 실패"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -772,28 +830,56 @@ msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 "바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "우분투 5.10 보안 업데이트"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "우분투 최신 버젼으로 업그레이드 합니다."
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "업데이트를 설치(_I)"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "설치할 수 없는 업데이트가 있습니다"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -803,53 +889,95 @@ msgstr ""
 "미 관리자의 \"모든 업그레이드 하기\" 기능을 사용하거나 터미널에서 \"sudo apt-"
 "get dist-upgrade\"를 실행하여 시스템을 완전하게 업데이트 하십시오."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "다음 업데이트는 무시됩니다:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "버전 %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "바뀐 목록을 다운로드 하는 중..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "다운로드 크기: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "시스템이 최신의 상태입니다."
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "업데이트가 끝났습니다."
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "새 버전: %s (크기: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "버전 %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "더 이상 지원되지 않는 배포판입니다."
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -859,17 +987,17 @@ msgstr ""
 "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에"
 "서 보실 수 있습니다."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>새 배포판 '%s'를 이용할 수 있습니다</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "소프트웨어 목록이 망가졌습니다."
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -989,11 +1117,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>인터넷 업데이트</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>인터넷 업데이트</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1232,178 +1361,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "우분투 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "커뮤니티에서 관리유지함 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "자유소프트웨어 아님 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "자유소프트웨어 아님 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "우분투 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "우분투 5.10 보안 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "업데이트를 설치(_I)"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "우분투 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "공식적으로 지원됨"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "우분투 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "우분투 5.10 보안 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "우분투 5.10 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "우분투 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "우분투 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "우분투 5.10 보안 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "우분투 5.10 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "우분투 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "우분투 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "커뮤니티에서 관리유지함 (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "자유소프트웨어 아님 (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "공식적으로 지원됨"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "저작권 제한됨"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "우분투 5.10 보안 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "우분투 5.10 업데이트"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "우분투 5.10 Backports"
@@ -1454,6 +1589,18 @@ msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG와 호환이 안되는 소프트웨어"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "%li 초 정도 남았음"
+
+#~ msgid "Download is complete"
+#~ msgstr "다운로드가 끝났습니다."
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "업그레이드가 중지되었습니다. 버그를 보고하여 주십시오."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "우분투를 업그레이드 하는 중"
+
 #~ msgid "Hide details"
 #~ msgstr "세부 정보 숨기기"
 
diff --git a/po/ku.po b/po/ku.po
index a847dcc4..57869bc9 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:43+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -134,64 +134,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nikarî '%s' saz bike"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +202,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -221,11 +249,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -234,42 +262,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -278,35 +306,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -315,217 +346,242 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Jê bibe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Tê bilindkirin"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Bilindkirina sîstemê temam bû."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Rojanekirin temam bû"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Daxistin hatiye temam kirin"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Guherandin tê bi kar anîn"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s paket dê were rakirin."
 msgstr[1] "%s paket dê werin rakirin."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s paket dê were sazkirin"
 msgstr[1] "%s paket dê werin sazkirin"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s paket dê were bilindkirin."
 msgstr[1] "%s paket dê werin bilindkirin."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Pêwîst e tu bi tevahî %s daxî."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Sîstema xwe berê hat bilindkirin."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s rake</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s saz bike"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s bilind bike"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -572,7 +628,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -592,26 +648,22 @@ msgid "Terminal"
 msgstr "Termînal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Ubuntu tê bilindkirin"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "Bi_parêze"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -632,64 +684,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -705,97 +757,165 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Ubuntu tê bilindkirin"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Guhertoya %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Mezinahiya daxistinê: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Sîstema te rojane ye"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Tu dikarî %s rojanekirinê saz bikî"
 msgstr[1] "Tu dikarî %s rojanekirinan saz bikî"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Rojanekirin temam bû"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Guhertoya nû: %s (Mezinahî: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Guhertoya %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -902,12 +1022,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet</b>"
+msgstr "<b>Kanal</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1126,173 +1247,178 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Neazad (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Neazad (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Bi piştgirtiya fermî"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Neazad (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Bi piştgirtiya fermî"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -1342,6 +1468,9 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Download is complete"
+#~ msgstr "Daxistin hatiye temam kirin"
+
 #~ msgid "Hide details"
 #~ msgstr "Hûragahiyan veşêre"
 
@@ -1353,6 +1482,3 @@ msgstr ""
 
 #~ msgid "     "
 #~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanal</b>"
diff --git a/po/lt.po b/po/lt.po
index d528796e..f30e5b26 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-28 20:07+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Programinės įrangos atnaujinimai"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Įveskite disko pavadinimą"
 msgid "Please insert a disc in the drive:"
 msgstr "Įdėkite diską į įrenginį:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -152,33 +152,36 @@ msgstr ""
 "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ "
 "arba „apt-get“."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Negalima atnaujinti reikiamų metapaketų"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Turėtų būti pašalintas esminis paketas"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Nepavyko paskaičiuoti atnaujinimo"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Iškilo neišsprendžiama problema apskaičiuojant atnaujinimą. Praneškite apie "
 "tai kaip klaidą. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Klaida autentikuojant keletą paketų"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -187,12 +190,12 @@ msgstr ""
 "Nepavyko patvirtinti kelių paketų autentiškumo. Tai gali būti laikina tinklo "
 "problema. Galite bandyti vėliau. Žemiau yra nepatvirtintų paketų sąrašas."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Negalima įdiegti „%s“"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -200,12 +203,12 @@ msgstr ""
 "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 #, fuzzy
 msgid "Can't guess meta-package"
 msgstr "Negalima nuspėti meta paketo"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -219,16 +222,43 @@ msgstr ""
 " Prieš tęsdami pirmiausia įdiekite vieną iš šių paketų naudodamiesi "
 "„synaptic“ arba „apt-get“."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Atsiųsti nepavyko"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Nuskaitoma talpykla"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 #, fuzzy
 msgid "No valid mirror found"
 msgstr "Nerasta tinkamo įrašo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -241,11 +271,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Ar sukurti numatytųjų šaltinių sąrašą?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -254,11 +284,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Saugyklų informacija netinkama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -266,11 +296,11 @@ msgstr ""
 "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. "
 "Praneškite apie tai kaip klaidą."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Trečiųjų šalių šaltiniai išjungti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -280,11 +310,11 @@ msgstr ""
 "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ "
 "įrankiu arba „Synaptic“ paketų tvarkykle."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Klaida atnaujinant"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -292,11 +322,11 @@ msgstr ""
 "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, "
 "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Diske nepakanka laisvos vietos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -305,28 +335,31 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "At norite pradėti atnaujinimą?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Nepavyko įdiegti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 #, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama naudoti. "
 "Dabar bus vykdomas atkūrimas (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Nepavyko atsiųsti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -334,11 +367,11 @@ msgstr ""
 "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo "
 "laikmeną ir bandykite dar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -352,23 +385,23 @@ msgstr ""
 "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui "
 "kitame žingsnyje. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Pašalinti pasenusius paketus?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Praleisti šį žingsnį"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "P_ašalinti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -377,110 +410,101 @@ msgstr ""
 "pranešime. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Perkraunama sistema"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Tikrinama paketų valdyklė"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Atnaujinama saugyklų informacija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Netinkama paketo informacija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Po to, kai buvo atnaujinta Jūsų paketo informacija, nebegalima rasti esminio "
 "paketo „%s“.\n"
 "Tai labai rimta problema, praneškite apie tai kaip klaidą."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Klausiama patvirtinimo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Atnaujinama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Ieškoma pasenusios programinės įrangos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Sistemos atnaujinimas baigtas."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Įdėkite „%s“ į įrenginį „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Atsiųsta"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Atnaujinimas užbaigtas"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Atsiunčiamas failas %li iš %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Pritaikomi pakeitimai"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nepavyko įdiegti „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Atnaujinimas nutrūko. Praneškite apie tai kaip apie klaidą."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -489,18 +513,20 @@ msgstr ""
 "Ar pakeisti konfigūracijos bylą\n"
 "„%s“?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Nerasta komanda „diff“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Įvyko lemtinga klaida"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Praneškite apie tai kaip klaidą ir prie pranešimo pridėkite „/var/log/dist-"
@@ -511,7 +537,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -519,7 +545,7 @@ msgstr[0] "Bus pašalintas %s paketas."
 msgstr[1] "Bus pašalinti %s paketai."
 msgstr[2] "Bus pašalinta %s paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -527,7 +553,7 @@ msgstr[0] "Bus įdiegtas %s naujas paketas."
 msgstr[1] "Bus įdiegti %s nauji paketai."
 msgstr[2] "Bus įdiegta %s naujų paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -535,52 +561,86 @@ msgstr[0] "Bus atnaujintas %s paketas."
 msgstr[1] "Bus atnaujinti %s paketai."
 msgstr[2] "Bus atnaujinta %s paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Turite atsisiųsti viso %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Nepavyko rasti jokių atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Jūsų sistema jau buvo atnaujinta."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Pašalinti %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Įdiegti %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Atnaujinti %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Reikia perkrauti kompiuterį"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -637,7 +697,8 @@ msgid "Difference between the files"
 msgstr "Skirtumai tarp bylų"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Atsiunčiami ir įdiegiami atnaujinimai"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -657,26 +718,22 @@ msgid "Terminal"
 msgstr "Terminalas"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Atnaujinama Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Palikti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "Pa_keisti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Pranešti apie klaidą"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Perkrauti dabar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Tęsti atnaujinimą"
 
@@ -698,58 +755,58 @@ msgid "Please check your internet connection."
 msgstr "Patikrinkite savo Interneto ryšį."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Nepavyko paleisti atnaujinimo priemonės"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Greičiausiai tai yra atnaujinimo priemonės klaida. Praneškite apie tai kaip "
 "klaidą"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Atsiunčiama atnaujinimo priemonė"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 #, fuzzy
 msgid "Upgrade tool signature"
 msgstr "Atnaujinimo priemonės parašas"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Atnaujinimo priemonė"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Atsiųsti nepavyko"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Nepavyko gauti atnaujinimo. Tai gali būti tinklo problema. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Nepavyko išpakuoti"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 "Nepavyko išpakuoti atnaujinimo. Gali būti tinklo arba serverio problema. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Tapatumo nustatymas nepavyko"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -757,11 +814,11 @@ msgstr ""
 "Atnaujinimo tapatumo nustatymas nepavyko. Gali būti tinklo arba serverio "
 "problema. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autentikacija nepavyko"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -779,27 +836,55 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 saugumo atnaujinimai"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Atnaujinti iki naujausios Ubuntu versijos"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Diegiami atnaujinimai"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Negalima įdiegti visų galimų atnaujinimų"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -810,30 +895,61 @@ msgstr ""
 "terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų sistema "
 "būtų visiškai atnaujinta."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Šie atnaujinimai nebus įdiegti:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versija %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Atsiunčiamas pakeitimų sąrašas..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Atsiuntimo dydis: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Jūsų sistema atnaujinta"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -841,24 +957,35 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus"
 msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus"
 msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Palaukite, tai gali užtrukti."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Atnaujinimas užbaigtas"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nauja versija: %s (Dydis: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versija %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Jūsų distribucija daugiau nebepalaikoma"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -868,17 +995,17 @@ msgstr ""
 "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie "
 "atnaujinimą rasite http://www.ubuntu.com ."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Programinės įrangos turinys sugadintas"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1002,11 +1129,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetiniai atnaujinimai</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internetiniai atnaujinimai</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1253,177 +1381,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 „Dapper Drake“"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 „Dapper Drake“"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Diegiami atnaujinimai"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 „Breezy Badger“"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Oficialiai palaikoma"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 „Breezy Badger“"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Prižiūrima oficialiai"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Apribotos autorinės teisės"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 atnaujinimai"
@@ -1474,6 +1608,15 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis
 msgid "Non-DFSG-compatible Software"
 msgstr "Su DFSG nesuderinama programinė įranga"
 
+#~ msgid "Download is complete"
+#~ msgstr "Atsiųsta"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Atnaujinimas nutrūko. Praneškite apie tai kaip apie klaidą."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Atnaujinama Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Slėpti detales"
 
diff --git a/po/mk.po b/po/mk.po
index ec6d72ed..a54a4b2f 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:43+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Надградба на софтвер"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Изворен код"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Изворен код"
@@ -141,56 +141,58 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -200,11 +202,11 @@ msgstr ""
 "како бубачка. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -213,15 +215,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -234,12 +262,12 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 #, fuzzy
 msgid "Generate default sources?"
 msgstr "Врати ги стандардните клучеви"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -248,43 +276,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Грешка при отстранување на клучот"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -293,35 +321,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -330,160 +361,148 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Веќе работи друг менаџер за пакети"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Надградбата е завршена"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Преземам промени..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
-"како бубачка."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -491,7 +510,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -499,7 +518,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -507,49 +526,82 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -597,7 +649,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -617,27 +669,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Освежи"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -658,11 +706,11 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
@@ -670,57 +718,57 @@ msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "Преземам промени"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Проверка"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -736,16 +784,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Достапна е нова верзија на Убунту!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -754,45 +802,103 @@ msgstr ""
 "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
 "врска е активна."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Безбедносни надградби за Debian Stable"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Инсталирам надградби..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Cannot install all available updates"
 msgstr "Проверувам за надградби..."
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Верзија %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Преземам промени"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "Преземам промени"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е надграден!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -800,42 +906,53 @@ msgstr[0] "Инсталирам надградби..."
 msgstr[1] "Инсталирам надградби..."
 msgstr[2] "Инсталирам надградби..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Верзија %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Вашата дистрибуција повеќе не е поддржана"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -944,12 +1061,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Надградби од интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Надградби од интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1190,178 +1308,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Безбедносни надградби за Debian Stable"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Инсталирам надградби..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Официјално поддржано"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Официјално поддржано"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Надградби за Убунту 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Надградби за Убунту 5.10"
@@ -1416,6 +1540,12 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
+#~ "ова како бубачка."
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Детали</b>"
 
diff --git a/po/ms.po b/po/ms.po
index bd5ccaea..0bf4b8b8 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-30 13:49+0000\n"
 "Last-Translator: azlinux <azlinux@gmail.com>\n"
 "Language-Team: Malay <ms@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgstr "Sila masukkan nama untuk cakera padat"
 msgid "Please insert a disc in the drive:"
 msgstr "Sila masukkan cakera padat kedalam pemacu"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Pakej rosak"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -153,45 +153,48 @@ msgstr ""
 "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get "
 "sebelum meneruskan."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Satu pakej yang perlu terpaksa dikeluarkan"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Tidak dapat menjangka penaikkan taraf"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Satu masaalah yang tidak dapat perbetulkan berlaku ketika menjangkakan taraf "
 "penaikkan. Sila laporkan ini sebagai ralat pepijat. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Tidak dapat memasang '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -200,11 +203,11 @@ msgstr ""
 "pepijat. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Pakej meta tidak dapat diduga."
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +221,41 @@ msgstr ""
 "Sila pasangkan salah satu pakej diatas dahulu menggunakan synaptic ataupun "
 "apt-get sebelum meneruskan pemasangan."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -239,11 +268,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -252,21 +281,21 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Sumber ketiga tidak diaktifkan."
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -277,11 +306,11 @@ msgstr ""
 "selepas penaikkan taraf  menggunakan alatan 'software-properties' ataupun "
 "'synaptic'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Ralat semasa pengemaskinian."
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -290,11 +319,11 @@ msgstr ""
 "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi "
 "sambungan rangkaian anda."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Muatak cakera keras tidak mencukupi."
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -306,27 +335,31 @@ msgstr ""
 "pemasangan sebelum ini menggunakan 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Anda mahu mulakan penaikkan taraf?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf."
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. "
 "Sistem 'recovery' telah dijalankan (dpkg --configure -a)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai."
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -334,11 +367,11 @@ msgstr ""
 "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau "
 "media pemasangan anda dan cuba lagi. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi."
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 #, fuzzy
 msgid ""
 "These installed packages are no longer officially supported, and are now "
@@ -352,217 +385,241 @@ msgstr ""
 "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan "
 "untuk dikeluarkan di peringkat selanjutnya. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Keluarkan pakej-pakej yang sudah luput?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -609,8 +666,9 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
-msgstr ""
+#, fuzzy
+msgid "Fetching and installing the upgrades"
+msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -629,26 +687,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -669,64 +723,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -742,97 +796,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
+#, python-format
+msgid "From version %s to %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:835
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "Version %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -938,11 +1059,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1160,163 +1281,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 2f015f9f..c01da700 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-29 13:06+0000\n"
 "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Programvareoppdateringer"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Kilde"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Kilde"
@@ -141,11 +141,11 @@ msgstr "Vennligst oppgi et navn for platen"
 msgid "Please insert a disc in the drive:"
 msgstr "Vennligst sett inn en plate i CD-spilleren:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Skadede pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -154,33 +154,36 @@ msgstr ""
 "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller "
 "apt-get før du fortsetter."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Kan ikke oppgradere nødvendige meta-pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "En nødvendig pakke må fjernes"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Kunne ikke forberede oppgraderingen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Et uløselig problem oppstod ved forberedelse av oppgraderingen. Vennligst "
 "rapporter dette som en feil. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Kunne ikke autentisere noen pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -190,12 +193,12 @@ msgstr ""
 "nettverksproblem, så du bør prøve igjen senere. Se under for listen over "
 "pakker som ikke kunne autentiseres."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -203,11 +206,11 @@ msgstr ""
 "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Kan ikke gjette på meta-pakke"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -221,15 +224,42 @@ msgstr ""
 " Vennligst installer én av de nevnte pakkene først ved å bruke synaptic "
 "eller apt-get før du fortsetter."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Kunne ikke hente"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Leser mellomlager"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Fant ikke noe gyldig speil"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -249,11 +279,11 @@ msgstr ""
 "Hvis du velger \"Nei\" vil oppgraderingen avbrytes."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Vil du opprette standardkilder?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -267,11 +297,11 @@ msgstr ""
 "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil "
 "oppdateringen avbrytes."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Ugyldig informasjon om arkiv"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -279,11 +309,11 @@ msgstr ""
 "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst "
 "rapporter dette som en feil."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Tredjepartskilder er deaktivert"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -293,11 +323,11 @@ msgstr ""
 "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for "
 "programvare' eller med Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Feil under oppdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -306,11 +336,11 @@ msgstr ""
 "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din "
 "og prøv igjen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Ikke nok ledig diskplass"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -322,27 +352,31 @@ msgstr ""
 "bruke 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Ønsker du å starte oppgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Kunne ikke installere oppgraderingene"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon "
 "ble forsøkt kjørt (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Kunne ikke laste ned alle oppgraderingene."
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -350,11 +384,11 @@ msgstr ""
 "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller "
 "installasjonsmediet og prøv på nytt. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Noe programvare er ikke lenger offisielt støttet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -368,23 +402,23 @@ msgstr ""
 "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet "
 "i neste steg. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Ønsker du å fjerne utdaterte pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Hopp over dette punktet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Feil ved commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -393,110 +427,101 @@ msgstr ""
 "informasjon. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Gjenoppretter systemets originale tilstand"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Sjekker pakkehåndterer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Oppdaterer informasjon om arkivet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Ugyldig pakkeinformasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Etter at pakkeinformasjonen ble oppdatert finnes ikke lenger den viktige "
 "pakken '%s'.\n"
 "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Spør om bekreftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Oppgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Søker etter utdatert programvare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Systemoppgraderingen er fullført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Rundt %li dager, %li timer og %li minutter gjenstår"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Rundt %li timer og %li minutter gjenstår"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Rundt %li minutter gjenstår"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Rundt %li sekunder gjenstår"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Vennligst sett inn '%s' i stasjonen '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Nedlastingen er fullført"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Oppdateringen er fullført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Laster ned fil %li av %li med %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Rundt %li minutter gjenstår"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Laster ned fil %li av %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Lagrer endringer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Kunne ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Oppgraderingen avbrytes nå. Vennligst rapporter dette som en feil."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -505,18 +530,20 @@ msgstr ""
 "Vil du erstatte konfigurasjonsfilen\n"
 "'%s?'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Kommandoen 'diff' ble ikke funnet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "En uopprettelig feil oppsto"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Vennligst rapporter feilen og inkluder filene /var/log/dist-upgrade.log og  /"
@@ -525,73 +552,107 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pakke vil bli fjernet."
 msgstr[1] "%s pakker vil bli fjernet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s pakke vil bli installert."
 msgstr[1] "%s pakker vil bli installert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pakke vil bli oppgradert."
 msgstr[1] "%s pakker vil bli oppgradert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Du må laste ned totalt %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere "
 "tidspunkt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Kunne ikke finne noen oppgraderinger"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Systemet ditt er allerede oppgradert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Fjern %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Installér %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Oppgradér %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Rundt %li dager, %li timer og %li minutter gjenstår"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Rundt %li timer og %li minutter gjenstår"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Omstart er nødvendig"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -647,7 +708,8 @@ msgid "Difference between the files"
 msgstr "Forskjell mellom filene"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Laster ned og installerer oppgraderingene"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -667,26 +729,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Oppgraderer Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Ta vare på"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Erstatt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Rapportér en feil"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Omstart nå"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Gjenoppta oppgradering"
 
@@ -707,48 +765,48 @@ msgid "Please check your internet connection."
 msgstr "Vennligst kontrollér internettforbindelsen."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Kunne ikke kjøre oppgraderingsverktøyet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Dette er mest sannsynlig en feil i oppgraderingsprogrammet. Vennligst "
 "rapporter denne feilen"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Laster ned oppgraderingsverktøyet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Dette programmet vil lede deg gjennom oppgraderingsprosessen."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Signatur for oppgraderingsprogrammet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Oppgraderingsprogram"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Kunne ikke hente"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Henting av oppgraderingen mislykkes. En mulig årsak kan være "
 "nettverksproblemer. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Utpakking feilet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -756,11 +814,11 @@ msgstr ""
 "Feil ved utpakking av oppgraderingen. Det kan være et problem med nettverket "
 "eller tjeneren. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verifisering feilet"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -768,11 +826,11 @@ msgstr ""
 "Verifisering av oppgraderingen feilet. Det kan være en feil med nettverket "
 "eller med tjeneren. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autentiseringen mislyktes"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -790,16 +848,16 @@ msgstr "Laster ned filen %li av %li med %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Laster ned fil %li av %li ved ukjent hastighet"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -807,12 +865,40 @@ msgstr ""
 "Kunne ikke laste ned listen med endringer. Vennligst kontrollér "
 "internettilkoblingen."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Oppgrader til siste versjon av Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Installerer oppdateringer"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Kan ikke installere alle tilgjengelige oppdateringer."
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -823,54 +909,96 @@ msgstr ""
 "kjør kommandoen \"sudo apt-get dist-upgrade\" i en terminal for å oppgradere "
 "systemet fullstendig."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Følgende pakker vil ikke bli oppgradert:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versjon %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Laster ned listen med endringer..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Nedlastingsstørrelse: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Du kan installere %s oppdatering"
 msgstr[1] "Du kan installere %s oppdateringer"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Vennligst vent, dette kan ta litt tid."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Oppdateringen er fullført"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Ny versjon: %s (Størrelse: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versjon %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribusjon er ikke lenger støttet"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -880,17 +1008,17 @@ msgstr ""
 "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www."
 "ubuntu.com for mer informasjon om oppgradering."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Programvareoversikten er ødelagt."
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1011,11 +1139,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Oppdateringer fra Internett</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Oppdateringer fra Internett</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1263,177 +1392,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Installerer oppdateringer"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Offisielt støttet"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1484,6 +1619,18 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Rundt %li sekunder gjenstår"
+
+#~ msgid "Download is complete"
+#~ msgstr "Nedlastingen er fullført"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Oppgraderingen avbrytes nå. Vennligst rapporter dette som en feil."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Oppgraderer Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Skjul detaljer"
 
diff --git a/po/ne.po b/po/ne.po
index d186e5ad..7a7e0a00 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:43+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -69,7 +69,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -78,27 +78,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "सफ्टवेयर अद्यावधिकहरु"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "स्रोत"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "स्रोत"
@@ -139,54 +139,56 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -194,11 +196,11 @@ msgid ""
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -207,15 +209,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -228,11 +256,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -241,43 +269,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "कुञ्जि हटाउँदा त्रुटि"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -286,35 +314,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -323,222 +354,245 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "स्तरवृद्धि समाप्त"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -586,7 +640,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -606,27 +660,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "फेरि लोड गर्नुहोस"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -647,67 +697,67 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "प्रमाणिकरण"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -723,103 +773,172 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 #, fuzzy
 msgid "The following updates will be skipped:"
 msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "संस्करण %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "तपाइं को प्रणालि अप-टु-डेट छ!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै"
 msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "संस्करण %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "तपाईंको वितरण समर्थित छैन"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -928,12 +1047,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1173,183 +1293,189 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "निषेधित प्रतिलिपि अधिकार"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
@@ -1403,6 +1529,11 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>विवरणहरु</b>"
 
diff --git a/po/nl.po b/po/nl.po
index 566c4663..e09ecc84 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 01:32+0000\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,26 +75,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Software-updates"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -141,11 +141,11 @@ msgstr "Geef het cd-schijfje een naam"
 msgid "Please insert a disc in the drive:"
 msgstr "Plaats een schijf in de speler:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -154,33 +154,36 @@ msgstr ""
 "met deze software. Repareer deze eerst met synaptic of apt-get voordat u "
 "verder gaat."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Kan de vereiste meta-pakketten niet upgraden."
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Een essentieel pakket zou verwijderd worden"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Kan de vereisten voor de upgrade niet berekenen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Tijdens het berekenen van de upgrade ontstond er een onoplosbaar probleem. "
 "Gelieve dit als fout te rapporteren. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Fout bij het bepalen van de echtheid van sommige pakketten"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -191,12 +194,12 @@ msgstr ""
 "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet "
 "vastgesteld is."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan '%s' niet installeren"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -205,11 +208,11 @@ msgstr ""
 "fout te rapporteren. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Kan het meta-pakket niet raden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -224,15 +227,42 @@ msgstr ""
 "Installeer eerst één van de bovenstaande pakketten met Synaptic of apt-get "
 "voordat u verder gaat."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Ophalen is mislukt"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Tijdelijke opslag inlezen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Geen geldige mirror-server gevonden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -253,11 +283,11 @@ msgstr ""
 "Wanneer u 'Nee' kiest, zal de update worden geannuleerd."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "De standaard bronnenlijst genereren?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -271,11 +301,11 @@ msgstr ""
 "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' "
 "kiest, zal de update worden geannuleerd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "De informatie over de pakketbronnen is ongeldig"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -283,11 +313,11 @@ msgstr ""
 "Het upgraden van de informatie over de pakketbronnen heeft het bestand "
 "ongeldig gemaakt. Rapporteer dit als een fout."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Pakketbronnen van derden uitgeschakeld"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -297,11 +327,11 @@ msgstr ""
 "kunt ze na de upgrade weer inschakelen via het menu Systeem -> Beheer -> "
 "Software-eigenschappen of met het programma Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Fout tijdens het updaten"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -309,11 +339,11 @@ msgstr ""
 "Tijdens het updaten is er iets misgegaan. Dit komt meestal door "
 "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Niet genoeg vrije schijfruimte"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -325,28 +355,32 @@ msgstr ""
 "vorige installaties via 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Wilt u beginnen met de upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Kon de upgrades niet installeren"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "De upgrade wordt nu afgebroken. Uw systeem bevindt zich mogelijk in een "
 "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure "
 "-a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Kon de upgrades niet downloaden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -354,11 +388,11 @@ msgstr ""
 "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het "
 "installatiemedium en probeer opnieuw. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Bepaalde software wordt niet meer officieel ondersteund"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -372,23 +406,23 @@ msgstr ""
 "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd "
 "worden om deze pakketten te verwijderen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Overbodige pakketten verwijderen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Deze stap overslaan"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Fout bij het toepassen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -397,110 +431,101 @@ msgstr ""
 "voor meer informatie. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "De oorspronkelijke toestand wordt hersteld"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Pakkettenbeheer controleren"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Updaten van de informatie over de pakketbronnen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Ongeldige pakketinformatie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Nu de pakketinformatie bijgewerkt is, kan het essentiële pakket '%s' niet "
 "meer gevonden worden.\n"
 "Dit is een ernstige fout, die gerapporteerd moet worden."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Vragen om bevestiging"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Bezig met upgraden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Zoeken naar overbodige software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Systeemupgrade is voltooid."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Ongeveer %li dagen %li uur en %li minuten resterend"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Ongeveer %li uur en %li minuten resterend"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Ongeveer %li minuten resterend"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Ongeveer %li seconden resterend"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Plaats '%s' in station '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Downloaden is voltooid"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "De update is voltooid"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Downloaden van bestand %li uit %li met %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Ongeveer %li minuten resterend"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Downloaden van bestand %li uit %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Wijzigingen worden doorgevoerd"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Kon '%s' niet installeren"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "De upgrade wordt nu afgebroken. Rapporteer deze fout."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -509,18 +534,20 @@ msgstr ""
 "Het configuratiebestand vervangen?\n"
 "'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "De opdracht 'diff' is niet gevonden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Er is een ernstige fout ontstaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Rapporteer dit als fout en voeg de bestanden /var/log/dist-upgrade.log en /"
@@ -531,74 +558,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Er zal %s pakket verwijderd worden."
 msgstr[1] "Er zullen %s pakketten verwijderd worden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "Er zal %s nieuw pakket geïnstalleerd worden."
 msgstr[1] "Er zullen %s nieuwe pakketten geïnstalleerd worden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pakket zal een upgrade krijgen"
 msgstr[1] "%s pakketten zullen een upgrade krijgen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "U moet in totaal %s downloaden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Het upgraden kan enkele uren in beslag nemen en kan tussentijds niet worden "
 "afgebroken."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Sluit alle openstaande toepassingen en documenten om dataverlies te "
 "voorkomen."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Kon geen upgrades vinden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Uw systeem heeft al een upgrade gekregen"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s verwijderen</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s installeren"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s upgraden"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Ongeveer %li dagen %li uur en %li minuten resterend"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Ongeveer %li uur en %li minuten resterend"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "De computer moet opnieuw opgestart worden"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -653,7 +714,8 @@ msgid "Difference between the files"
 msgstr "Verschillen tussen de bestanden"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Downloaden en installeren van de upgrades"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -673,26 +735,22 @@ msgid "Terminal"
 msgstr "Terminalvenster"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Upgraden van Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Behouden"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Fout rapporteren"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Nu herstarten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Upgrade hervatten"
 
@@ -713,47 +771,47 @@ msgid "Please check your internet connection."
 msgstr "Controleer uw internetverbinding."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Kon het upgrade-programma niet uitvoeren"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Dit is waarschijnlijk een fout in het upgrade-programma. Rapporteer deze "
 "fout."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Downloaden van het upgrade-programma"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Het upgrade-programma zal u door het upgrade-proces gidsen."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Upgrade-programma handtekening"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Upgrade-programma"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Ophalen is mislukt"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Het ophalen van de upgrade is mislukt. Er is mogelijk een netwerkprobleem. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Uitpakken is mislukt"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -761,11 +819,11 @@ msgstr ""
 "Het uitpakken van de upgrade is mislukt. Er is mogelijk een probleem met het "
 "netwerk of de server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verificatie is mislukt"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -773,11 +831,11 @@ msgstr ""
 "Het verifiëren van de upgrade is mislukt. Er is mogelijk een probleem met "
 "het netwerk of de server. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Echtheidscontrole is mislukt"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -795,20 +853,20 @@ msgstr "Downloaden van bestand %li uit %li met %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Downloaden van bestand %li uit %li, snelheid onbekend"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. "
 "Probeer het later nog eens."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. "
 "Probeer het later nog eens."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -816,12 +874,40 @@ msgstr ""
 "Kon de lijst met wijzigingen niet downloaden. Controleer uw "
 "internetverbinding."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 veiligheidsupdates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Upgrade naar de nieuwste versie van Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Up_dates installeren"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Kan de beschikbare updates niet installeren"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -832,54 +918,96 @@ msgstr ""
 "\"Synaptic\" of gebruik: \"sudo apt-get dist-upgrade\" in een "
 "terminalvenster om uw systeem compleet bij te werken met de laatste updates."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "De volgende updates worden overgeslagen:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versie %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Het overzicht van de wijzigingen wordt gedownload..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Downloadgrootte: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Uw systeem is up-to-date"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "U kunt %s update installeren"
 msgstr[1] "U kunt %s updates installeren"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Een ogenblik geduld, dit kan even duren."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "De update is voltooid"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nieuwe versie: %s (Grootte: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versie %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Uw distributie wordt niet langer ondersteund"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -889,17 +1017,17 @@ msgstr ""
 "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu."
 "com voor meer informatie over upgraden."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Software-index is beschadigd"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1020,11 +1148,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet-updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1270,178 +1399,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Door de gemeenschap beheerd (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Niet-vrij (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Niet-vrij (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Up_dates installeren"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Officieel ondersteund"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Door de gemeenschap beheerd (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Niet-vrij (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Officieel ondersteund"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Beperkte auteursrechten"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 backports"
@@ -1492,6 +1627,18 @@ msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software niet compatibel met DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Ongeveer %li seconden resterend"
+
+#~ msgid "Download is complete"
+#~ msgstr "Downloaden is voltooid"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "De upgrade wordt nu afgebroken. Rapporteer deze fout."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Upgraden van Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Details verbergen"
 
diff --git a/po/no.po b/po/no.po
index 0450f229..f4e86250 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+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"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,27 +77,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Programvareoppdateringer"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Kilde"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Kilde"
@@ -139,55 +139,57 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -196,11 +198,11 @@ msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -209,15 +211,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -230,11 +258,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -243,43 +271,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Feil under fjerning av nøkkel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -288,35 +316,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -325,224 +356,246 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "En annen pakkehåndterer kjører"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Undersøker systemkonfigurasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Laster ned endringer..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Systemet har ødelagte pakker!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -590,7 +643,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -610,27 +663,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Oppdater"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -651,69 +700,69 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 #, fuzzy
 msgid "Upgrade tool"
 msgstr "Oppgradering fullført"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentisering"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -729,103 +778,172 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Security Updates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Installerer oppdateringer..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 #, fuzzy
 msgid "The following updates will be skipped:"
 msgstr "De følgende pakkene er ikke oppgradert:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versjon %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Systemet er helt oppdatert!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installerer oppdateringer..."
 msgstr[1] "Installerer oppdateringer..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versjon %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribusjon er ikke lenger støttet"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -934,12 +1052,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Oppdateringer fra Internett</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Oppdateringer fra Internett</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1179,181 +1298,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Installerer oppdateringer..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Offisielt støttet"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
@@ -1408,6 +1533,11 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Detaljer</b>"
 
diff --git a/po/oc.po b/po/oc.po
index 9f6a934b..cd4a7bac 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-29 08:11+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,25 +77,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -141,64 +141,66 @@ msgstr "Picatz un nom pel disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Metètz un disc dins lo legidor :"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Paquetatges corromputs"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Impossible calcular la mesa a jorn"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossible installar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -207,15 +209,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -228,11 +256,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -241,42 +269,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Error al moment de metre a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Pas pro d'espaci liure"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -285,35 +313,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Volètz començar la mesa a jorn ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Impossible installar las mesas a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Impossible descargar las mesas a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -322,217 +353,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Suprimir"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Mesa a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "La mesa a jorn del sistèma es acabada."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Debètz telecargar un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Suprimir %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Installar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Metre a jorn %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -579,8 +634,9 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
-msgstr ""
+#, fuzzy
+msgid "Fetching and installing the upgrades"
+msgstr "Impossible installar las mesas a jorn"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -599,26 +655,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Metre a jorn Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Remplaçar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Tornar aviar ara"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -639,64 +691,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Esplech de mesa a jorn"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -712,97 +764,166 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Metre a jorn Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "<b>Mesas a jorn per internet</b>"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s : \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Talha de la descarga : %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Podètz installar %s mesa a jorn"
 msgstr[1] "Podètz installar %s mesas a jorn"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s : \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -910,11 +1031,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Mesas a jorn per internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Mesas a jorn per internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1134,176 +1256,181 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Pas liure (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Pas liure (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Pas liure (multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 5fff5a52..6f74b26b 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-04-28 23:31+0000\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,26 +77,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -136,64 +136,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -202,15 +204,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -223,11 +251,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -236,42 +264,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -280,35 +308,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -317,218 +348,242 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -576,7 +631,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -596,26 +651,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
@@ -637,66 +688,66 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 #, fuzzy
 msgid "Upgrade tool"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -712,97 +763,166 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
+#, python-format
+msgid "From version %s to %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:835
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "Version %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -912,12 +1032,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1143,164 +1264,170 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index f3e2c10f..a58b4d95 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:59+0000\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Aktualizacje oprogramowania"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Źródłowy"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Źródłowy"
@@ -140,11 +140,11 @@ msgstr "Proszę podać nazwę dla płyty"
 msgid "Please insert a disc in the drive:"
 msgstr "Proszę włożyć płytę do napędu:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Uszkodzone pakiety"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -153,33 +153,36 @@ msgstr ""
 "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub "
 "apt-get."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Nie można zaktualizować wymaganych meta-pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Niezbędny pakiet musiałby zostać usunięty"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Nie można przetworzyć aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. Proszę "
 "zgłosić to jako błąd. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Błąd podczas uwierzytelniania niektórych pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -189,23 +192,23 @@ msgstr ""
 "sieci. Można spróbować ponownie później. Poniżej znajduje się lista "
 "nieuwierzytelnionych pakietów."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nie można zainstalować \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -217,15 +220,42 @@ msgstr ""
 "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:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Pobranie nie powiodło się"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Odczytywanie bufora podręcznego"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Nie odnaleziono poprawnego serwera lustrzanego"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -245,11 +275,11 @@ msgstr ""
 "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Wygenerować domyślne źródła?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -263,11 +293,11 @@ msgstr ""
 "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" "
 "aktualizacja zostanie anulowana."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Błędne informacje o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -275,11 +305,11 @@ msgstr ""
 "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę "
 "zgłosić ten błąd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Źródła stron niezależnych zostały wyłączone"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -289,11 +319,11 @@ msgstr ""
 "włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" "
 "lub za pomocą Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Błąd podczas aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -301,11 +331,11 @@ msgstr ""
 "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z "
 "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Zbyt mało miejsca na dysku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -317,28 +347,32 @@ msgstr ""
 "\"sudo apt-get clean\"."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Czy chcesz rozpocząć aktualizację?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem."
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Aktualizacja została przerwana. System może znajdować się w stanie "
 "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --"
 "configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Pobranie aktualizacji było niemożliwe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -346,11 +380,11 @@ msgstr ""
 "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz "
 "dysk instalacyjny i spróbować ponownie. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Niektóre programy nie są już oficjalnie wspierane"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -364,23 +398,23 @@ msgstr ""
 "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie "
 "zasugerowane ich usunięcie. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Usunąć niepotrzebne pakiety?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Pomiń ten krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Błąd podczas zatwierdzania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -389,110 +423,101 @@ msgstr ""
 "poniższych wiadomościach. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Przywracanie pierwotnego stanu systemu"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Sprawdzanie menedżera pakietów"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Aktualizowanie informacji o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Błędne informacje o pakietach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Po aktualizacji informacji o pakietach, podstawowy pakiet \"%s\" nie mógł "
 "być odnaleziony.\n"
 "To wskazuje na poważny problem, proszę zgłosić ten błąd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Pytanie o potwierdzenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Aktualizacja w toku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Aktualizacja systemu zakończona powodzeniem."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Około %li dni %li godzin %li minut pozostało"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Około %li godzin %li minut pozostało"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Około %li minut pozostało"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Około %li sekund pozostało"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Proszę włożyć \"%s\" do napędu \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Pobieranie zostało zakończone."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Aktualizacja została ukończona."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Około %li minut pozostało"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Pobieranie pliku %li z %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Zatwierdzanie zmian"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nie można było zainstalować \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -501,18 +526,20 @@ msgstr ""
 "Zastąpić plik konfiguracyjny\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Polecenie \"diff\" nie zostało odnalezione"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Wystąpił błąd krytyczny"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log oraz "
@@ -522,7 +549,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -530,7 +557,7 @@ msgstr[0] "%s pakiet zostanie usunięty."
 msgstr[1] "%s pakiety zostaną usunięte."
 msgstr[2] "%s pakietów zostanie usuniętych."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -538,7 +565,7 @@ msgstr[0] "%s nowy pakiet zostanie zainstalowany."
 msgstr[1] "%s nowe pakiety zostaną zainstalowane."
 msgstr[2] "%s nowy pakietów zostanie zainstalowane."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -546,52 +573,86 @@ msgstr[0] "%s pakiet zostanie zaktualizowany."
 msgstr[1] "%s pakiety zostaną zaktualizowane."
 msgstr[2] "%s pakietów zostanie zaktualizowanych."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Konieczne pobranie ogółem %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Nie odnaleziono żadnych aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "System został już zaktualizowany."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Usuń %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instaluj %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Aktualizuj %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Około %li dni %li godzin %li minut pozostało"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Około %li godzin %li minut pozostało"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Wymagane ponowne uruchomienie komputera"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -647,7 +708,8 @@ msgid "Difference between the files"
 msgstr "Różnice pomiędzy plikami"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Pobieranie i instalowanie aktualizacji"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -667,26 +729,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Aktualizacja Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Zachowaj"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "Zas_tąp"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "Zgłoś _błąd"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Uruchom ponownie"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Wznów aktualizację"
 
@@ -707,46 +765,46 @@ msgid "Please check your internet connection."
 msgstr "Proszę sprawdzić swoje połączenie internetowe."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Nie można było uruchomić narzędzia aktualizacji"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "To najprawdopodobniej błąd w narzędziu aktualizacji. Proszę zgłosić to jako "
 "błąd."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Pobieranie narzędzia aktualizacji"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Narzędzie aktualizacji przeprowadzi cię przez proces aktualizacji."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Podpis narzędzia aktualizacji"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Narzędzie aktualizacji"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Pobranie nie powiodło się"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Pobranie aktualizacji nie powiodło się. To może być problem sieciowy. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Wyodrębnienie nie powiodło się"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -754,11 +812,11 @@ msgstr ""
 "Wyodrębnienie aktualizacji nie powiodło się. To może być problem sieciowy "
 "lub z serwerem. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Weryfikacja nie powiodła się"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -766,11 +824,11 @@ msgstr ""
 "Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy lub "
 "z serwerem. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -788,16 +846,16 @@ msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -805,12 +863,40 @@ msgstr ""
 "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z "
 "Internetem."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Zaktualizuj do najnowszej wersji Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Instalowanie pakietów"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -821,30 +907,61 @@ msgstr ""
 "w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade\" w "
 "terminalu."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Następujące pakiety zostaną pominięte:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Wersja %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Pobieranie informacji o zmianach..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Rozmiar do pobrania: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Twój system jest w pełni zaktualizowany"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -852,24 +969,35 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s"
 msgstr[1] "Ilość dostępnych aktualizacji: %s"
 msgstr[2] "Ilość dostępnych aktualizacji: %s"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Proszę czekać, to może chwilę potrwać."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Aktualizacja została ukończona."
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nowa wersja: %s (Rozmiar: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Wersja %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Twoja dystrybucja nie jest już wspierana"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -879,17 +1007,17 @@ msgstr ""
 "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. "
 "Odwiedź http://www.ubuntu.com po więcej informacji."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Spis oprogramowania jest uszkodzony"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1011,11 +1139,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Aktualizacje internetowe</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Aktualizacje internetowe</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1262,177 +1391,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Utrzymywane przez społeczność (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Nie-wolnodostępne (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Nie-wolnodostępne (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Instalowanie pakietów"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Wspierane oficjalnie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Utrzymywane przez społeczność (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Nie-wolnodostępne (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Wspierane oficjalnie"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "O ograniczonych prawach kopiowania"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
@@ -1483,6 +1618,18 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
 msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Około %li sekund pozostało"
+
+#~ msgid "Download is complete"
+#~ msgstr "Pobieranie zostało zakończone."
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Aktualizacja Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Ukryj szczegóły"
 
diff --git a/po/pt.po b/po/pt.po
index 86cd5af4..a00e4343 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 10:17+0000\n"
 "Last-Translator: Joao Carvalhinho <latrine@gmail.com>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
@@ -65,7 +65,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -74,26 +74,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Actualizações de Software"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgstr "Por favor introduza um nome para o disco"
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor introduza um disco no leitor:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Pacotes Quebrados"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -152,33 +152,36 @@ msgstr ""
 "este software. Por favor corrija-os usando o synaptic ou apt-get antes de "
 "continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Não foi possível actualizar os meta-pacotes necessários"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 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:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Impossível de calcular a actualização"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Um problema 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:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Erro ao autenticar alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,12 +191,12 @@ msgstr ""
 "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma "
 "lista de pacotes não autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossível de instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -201,11 +204,11 @@ msgstr ""
 "Foi impossível instalar um pacote essencial. Por favor reporte este erro. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Impossível de descobrir meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -219,15 +222,42 @@ msgstr ""
 " Por favor instale um dos pacotes acima mencionados usando o synaptic ou apt-"
 "get antes de continuar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Falha a obter"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "A ler a cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Nenhum repositório válido encontrada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -248,11 +278,11 @@ msgstr ""
 "Se escolher \"não\" a actualização irá ser cancelada."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Gerar as fontes padrão?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -266,11 +296,11 @@ msgstr ""
 "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a "
 "actualização será cancelada."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Informação de repositório inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -278,11 +308,11 @@ msgstr ""
 "A actualização da informação de repositório resultou num ficheiro inválido. "
 "Por favor reporte este erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Fontes de terceiros desactivadas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -292,11 +322,11 @@ msgstr ""
 "reactivá-las depois da actualização com a ferramenta 'propriedades-software' "
 "ou com o synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Erro durante a actualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -305,11 +335,11 @@ msgstr ""
 "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a "
 "tentar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Não existe espaço livre em disco suficiente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -321,27 +351,31 @@ msgstr ""
 "usando 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Deseja iniciar a actualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Impossível de instalar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "A actualização abortará agora. O seu sistema poderá estar num estado "
 "inutilizável. Foi efectuada uma recuperação (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Impossível de descarregar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -349,11 +383,11 @@ msgstr ""
 "A actualização abortará agora. Por favor verifique a sua ligação à internet "
 "ou media de instalação e volte a tentar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Algum software já não é suportado oficialmente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -367,23 +401,23 @@ msgstr ""
 "Se não tem o repositório 'universe' activo será sugerida a remoção destes "
 "pacotes no próximo passo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Saltar Este Passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Erro ao submeter"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -392,111 +426,102 @@ msgstr ""
 "abaixo para mais informação. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "A restaurar o estado original do sistema"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "A verificar gestor de pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "A Actualizar informação de repositórios"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Informação de pacotes inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Depois da informação de pacotes ser actualizada já não pode ser encontrado o "
 "pacote essencial '%s'.\n"
 "Isto indica um erro sério, por favor reporte este problema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "A pedir confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "A actualizar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "À procura de software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "A actualização do sistema está completa."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Cerca de %li dias %li horas %li minutos restantes"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Cerca de %li horas %li minutos restantes"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Cerca de %li minutos restantes"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Cerca de %li segundos restantes"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no leitor '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "O Download está completo"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "A actualização está completa"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "A descarregar ficheiro %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Cerca de %li minutos restantes"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "A descarregar ficheiro %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Aplicando alterações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "A actualização abortará agora. Reporte este erro."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -505,18 +530,20 @@ msgstr ""
 "Substituir ficheiro de configuração\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "O comando 'diff' não foi encontrado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Por favor reporte este erro e inclua os ficheiros ~/dist-upgrade.log e ~/"
@@ -526,74 +553,108 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pacote será removido."
 msgstr[1] "%s pacotes serão removidos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s novo pacote será instalado."
 msgstr[1] "%s novos pacotes serão instalados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pacote será actualizado."
 msgstr[1] "%s pacotes serão actualizados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Tem de efectuar o download de um total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "A actualização poderá demorar várias horas e não poderá ser cancelada a "
 "qualquer instante posteriormente."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 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:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Impossível de encontrar quaisquer actualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "O seu sistema já foi actualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Remover %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Cerca de %li dias %li horas %li minutos restantes"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Cerca de %li horas %li minutos restantes"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Necessário reiniciar"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -648,7 +709,8 @@ msgid "Difference between the files"
 msgstr "Diferença entre os ficheiros"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "A descarregar e a instalar actualizações"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -668,26 +730,22 @@ msgid "Terminal"
 msgstr "Consola"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "A actualizar o Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Manter"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Reportar um erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Reiniciar agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Retomar Actualização?"
 
@@ -708,46 +766,46 @@ msgid "Please check your internet connection."
 msgstr "Por favor verifique a sua ligação à internet."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Impossível de executar a ferramenta de actualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Isto é provavelmente um erro na ferramenta de actualização. Por favor "
 "reporte o problema."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "A descarregar a ferramenta de actualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "A ferramenta de actualização guiá-lo-á pelo processo de actualização."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Assinatura da ferramenta de actualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Ferramenta de actualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Falha a obter"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Falha a obter a actualização. Poderá existir um problema de rede. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Falha ao extrair"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -755,11 +813,11 @@ msgstr ""
 "Extracção da actualização falhou. Poderá existir um problema com a rede ou "
 "com o servidor. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Falhou a verificação"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -767,11 +825,11 @@ msgstr ""
 "Verificação da actualização falhou. Poderá existir um problema com a rede ou "
 "com o servidor. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autenticação falhou"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -789,18 +847,18 @@ msgstr "A descarregar ficheiro %li de %li a %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "A lista de alterações ainda não está disponível. Por favor tente mais tarde."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "A lista de alterações ainda não está disponível. Por favor tente mais tarde."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -808,12 +866,40 @@ msgstr ""
 "Falha a descarregar a lista de alterações. Por favor verifique a sua ligação "
 "à internet."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Actualizações de Segurança"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Actualize para a última versão do Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "A instalar actualizações"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Impossível de instalar todas as actualizações disponíveis"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -823,54 +909,96 @@ msgstr ""
 "\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade\" "
 "numa consola para actualizar completamente o seu sistema."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "As seguintes actualizações serão ignoradas:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versão %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "A descarregar lista de alterações..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Tamanho do download: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Pode instalar %s actualização"
 msgstr[1] "Pode instalar %s actualizações"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Por favor aguarde, isto pode levar algum tempo."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "A actualização está completa"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nova versão: %s (Tamanho: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versão %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "A sua distribuição já não é suportada"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -880,17 +1008,17 @@ msgstr ""
 "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais "
 "informação em como actualizar."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "O índice de software está quebrado"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1012,11 +1140,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizações Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Actualizações Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1262,178 +1391,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Mantido pela comunidade (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Não-livre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "A instalar actualizações"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Suportado Oficialmente"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Mantido pela comunidade (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Suportado Oficialmente"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Direitos de autor restritos"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1484,6 +1619,18 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Cerca de %li segundos restantes"
+
+#~ msgid "Download is complete"
+#~ msgstr "O Download está completo"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "A actualização abortará agora. Reporte este erro."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "A actualizar o Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Esconder detalhes"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0cd6d801..704008d1 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-26 22:31+0000\n"
 "Last-Translator: KurtKraut <ubuntu@kurtkraut.net>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,27 +75,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Modificando os canais de programas"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Source"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Source"
@@ -143,11 +143,11 @@ msgstr "Por favor digite um nome para o disco"
 msgid "Please insert a disc in the drive:"
 msgstr "Por favor insira um disco no drive:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -156,33 +156,36 @@ msgstr ""
 "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes "
 "de continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Não foi possível atualizar os meta-pacotes requeridos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 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:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Não foi possível calcular a atualização"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Um problema sem resolução ocorreu enquanto calculando a atualização. Por "
 "favor reporte isto como um erro. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Erro autenticando alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
@@ -192,12 +195,12 @@ msgstr ""
 "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes "
 "não-autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -206,11 +209,11 @@ msgstr ""
 "um erro. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Não foi possível adivinhar o meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -224,15 +227,42 @@ msgstr ""
 "Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get "
 "antes de continuar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Falha ao obter"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Lendo cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Nenhum repositório válido encontrado"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -252,11 +282,11 @@ msgstr ""
 "Se você selecionar 'não' a atualização será cancelada."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Gerar sources padrão?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -270,11 +300,11 @@ msgstr ""
 "Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' a "
 "atualização será cancelada."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Informação de repositório inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -282,11 +312,11 @@ msgstr ""
 "Atualizando a informações de repositórios resultou em um arquivo inválido. "
 "Por favor reporte isso como um erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Fontes de terceiros desabilitadas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -296,11 +326,11 @@ msgstr ""
 "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do "
 "programa' ou com o synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Erro durante a atualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -309,11 +339,11 @@ msgstr ""
 "problemas de rede, por favor verifique a sua conexão de rede e tente "
 "novamente."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Não há espaço suficiente no disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -325,27 +355,31 @@ msgstr ""
 "instalações anteriores usando 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Você quer iniciar a atualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Não foi possível instalar as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "A atualização será abortada agora. Seu sistema pode estar em um estado "
 "instável. Uma recuperação é executada (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Não foi possível obter as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -353,11 +387,11 @@ msgstr ""
 "A atualização será abortada agora. Por favor verifique sua conexão à "
 "Internet ou mídia de instalação e tente de novo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Alguns softwares não são mais oficialmente suportado."
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -371,23 +405,23 @@ msgstr ""
 "Se você não tem o repositório 'universe' habilitado, estes pacotes serão "
 "sugeridos à remoção no próximo passo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Pular Este Passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Erro ao aplicar as mudanças"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -396,111 +430,102 @@ msgstr ""
 "abaixo para maiores informações. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Reiniciando o estado original do sistema"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Verificando o Gerenciador de Pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Atualizando informação do repositório"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 #, fuzzy
 msgid "Invalid package information"
 msgstr "Informação do pacote inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Depois que a informação do seu pacote foi atualizada o pacote essencial '%s' "
 "não pôde mais ser encontrado.\n"
 "Isto indica um sério erro, por favor reporte isso como um erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Pedindi por confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Atualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Buscando programas obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "A Atualização do Sistema está completa."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Aproximadamente %li dias %li horas %li minutos restando"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Aproximadamente %li horas %li minutos restando"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Aproximadamente %li minutos restando"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Aproximadamente %li segundos restando"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no drive '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "O Download está completo"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Atualização completa"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Obtendo arquivo %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Aproximadamente %li minutos restando"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Obtendo arquivo %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "A atualização será abortada agora. Por favor reporte este erro."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -509,18 +534,20 @@ msgstr ""
 "Substituir arquivo de configuração\n"
 "'%s' ?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "O comando 'diff' não foi encontrado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Por favor reporte isto como um bug e inclua os arquivos /var/log/dist-"
@@ -530,71 +557,105 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pacote será removido."
 msgstr[1] "%s pacotes serão removidos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s novo pacote será instalado."
 msgstr[1] "%s novos pacotes serão instalados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pacote será atualizado."
 msgstr[1] "%s pacotes serão atualizados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Você precisa obter um total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "A atualização pode levar diversas horas e não poderá ser cancelada depois."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Para evitar perda de dados, feche todas as aplicações e documentos."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Não foi possível encontrar nenhuma atualização"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Seu sistema já foi atualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Remover %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Atualizar %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Aproximadamente %li dias %li horas %li minutos restando"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Aproximadamente %li horas %li minutos restando"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Reinicialização requerida"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -650,7 +711,8 @@ msgid "Difference between the files"
 msgstr "Diferenças entre os arquivos"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Obtendo e instalando as atualizações"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -670,26 +732,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Atualizando o Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Manter"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Subtituir"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "Reportar _Erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Reiniciar Agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "Continua_r Atualização"
 
@@ -710,47 +768,47 @@ msgid "Please check your internet connection."
 msgstr "Por favor, verifique sua conexão de internet."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Não foi possível executar a ferramenta de atualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Este é, provavelmente, um bug na ferramenta de atualização. Por favor, "
 "reporte-o como tal"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Obtendo a ferramenta de atualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "A ferramenta de atualização irá guia-lo pelo processo."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Assinatura da ferramenta de atualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Ferramenta de atualização"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Falha ao obter"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Falha ao obter a atualização. Pode ter havido algum problema com a rede. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Falha ao extrair"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -758,11 +816,11 @@ msgstr ""
 "Falha ao extrair a atualização. Pode ter havido um problema com a rede ou "
 "com o servidor. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Falha na verificação"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -770,11 +828,11 @@ msgstr ""
 "Falha na verificação da atualização. Pode ter havido um problema com a rede "
 "ou com o servidor. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Falha na autenticação"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -792,20 +850,20 @@ msgstr "Obtendo arquivo %li de %li a %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "A lista de alterações não está disponível ainda. Por favor, tente novamente "
 "mais tarde."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "A lista de alterações não está disponível ainda. Por favor, tente novamente "
 "mais tarde."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -813,12 +871,40 @@ msgstr ""
 "Não foi possível baixar a lista de mudanças. Por favor, verifique sua "
 "conexão com a internet."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Atualizações de Segurança do Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Atualizar para a última versão do Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Instalando Atualizações"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Não foi possível instalar todas as atualizações disponíveis"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -829,54 +915,96 @@ msgstr ""
 "\"sudo apt-get dist-upgrade\" em um terminal para atualizar seu sistema "
 "completamente."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "As seguintes atualizações serão puladas:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Obtendo a lista de alterações"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Tamanho do download: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Seu sistema está atualizado"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Você pode instalar %s atualização"
 msgstr[1] "Você pode instalar %s atualizações"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Por favor, espere, isto pode levar algum tempo."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Atualização completa"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "New version: %s (Tamanho: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Sua distribuição não é mais suportada"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -886,17 +1014,17 @@ msgstr ""
 "falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. "
 "Veja http://www.ubuntu-br.org"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "A índex de software está quebrado"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1019,11 +1147,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Atualizações via Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Atualizações via Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1272,177 +1401,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Mantido pela Comunidade (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Não-livre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Atualizações de Segurança do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Instalando Atualizações"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Suporte oficial"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Atualizações de Segurança do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backports do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Atualizações de Segurança do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Mantido pela Comunidade (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Suportado Oficialmente"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Restrito por copyright"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports do Ubuntu 5.10"
@@ -1493,6 +1628,18 @@ 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 "About %li seconds remaining"
+#~ msgstr "Aproximadamente %li segundos restando"
+
+#~ msgid "Download is complete"
+#~ msgstr "O Download está completo"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "A atualização será abortada agora. Por favor reporte este erro."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Atualizando o Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Esconder detalhes"
 
diff --git a/po/ro.po b/po/ro.po
index 8b4e20f2..acf4aab7 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 17:39+0000\n"
 "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,29 +76,29 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Actualizări software"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr ""
 "Binar\n"
 "Sursă"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr ""
@@ -145,12 +145,12 @@ msgstr "Introduceţi un nume pentru disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Introduceţi un disc în unitate:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 #, fuzzy
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 #, fuzzy
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
@@ -160,44 +160,46 @@ msgstr ""
 "program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic "
 "sau apt-get."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 #, fuzzy
 msgid "Error authenticating some packages"
 msgstr "Eroare la autentificarea unor pachete."
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nu pot instala '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -207,11 +209,11 @@ msgstr ""
 "(eroare). "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -220,15 +222,42 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Nu s-a putut extrage"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Citire cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -241,11 +270,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -254,42 +283,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Eroare în timpul actualizării"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Spaţiu liber insuficient"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -298,35 +327,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Vrei sa începi upgrade-ul?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Nu s-au putut instalat upgrade-urile"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Nu pot descărca actualizările"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -335,155 +367,146 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "Şter_ge"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "Se reface starea iniţială a sistemului"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Se verifică managerul de pachete"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Se actualizează"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Actualizarea sistemului este completă"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Se aplică modificările"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -491,7 +514,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -499,7 +522,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -507,49 +530,82 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Nu s-au găsit actualizări"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Sistemul dumneavoastră este actualizat la zi!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -596,8 +652,9 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
-msgstr ""
+#, fuzzy
+msgid "Fetching and installing the upgrades"
+msgstr "Nu s-au putut instalat upgrade-urile"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -616,26 +673,22 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Se actualizează Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Continuă Actualizarea"
 
@@ -656,66 +709,66 @@ msgid "Please check your internet connection."
 msgstr "Verificaţi conexiunea internet"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Acest lucru este cel mai probabil o eroare. Raportaţi acest lucru ca eroare."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Nu s-a putut extrage"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autentificare eşuată"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -731,16 +784,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Nu există nici un pachet de actualizat."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -749,43 +802,102 @@ msgstr ""
 "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o "
 "conexiune internet activă."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Actualizări de Securitate Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Se actualizează Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_Instalează actualizarile"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versiunea %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Se descarcă listă schimbărilor..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Sistemul dumneavoastră este actualizat la zi!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -793,42 +905,53 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Versiunea nouă: %s (Mărime: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Versiunea %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Distribuţia dvs. nu mai este suportată"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -938,11 +1061,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizări de pe Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Actualizări de pe Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1184,179 +1308,185 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Pachete non-libere (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Pachete non-libere (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Actualizări de Securitate Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_Instalează actualizarile"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Pachete suportate oficial"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizări de Securitate Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizări Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizări de Securitate Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizări Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Pachete non-libere (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Pachete suportate oficial"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Copyright restrictiv"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizări de securitate Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizări Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Actualizări de securitate Ubuntu 5.04"
diff --git a/po/ru.po b/po/ru.po
index aeab7e61..ed3b0bb7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-25 19:23+0000\n"
 "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,26 +77,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Обновления программ"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgstr "Введите название для диска"
 msgid "Please insert a disc in the drive:"
 msgstr "Пожалуйста, вставьте диск в привод:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Поврежденные пакеты"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -153,33 +153,36 @@ msgstr ""
 "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, "
 "прежде чем продолжить."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Невозможно обновить требуемые мета-пакеты"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Будет удален необходимый пакет"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Невозможно подготовить обновление системы"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "При подготовке к обновлению системы возникла неразрешимая проблема. "
 "Пожалуйста, отправьте отчет об ошибке. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Ошибка при проверке подлинности некоторых пакетов"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -189,12 +192,12 @@ msgstr ""
 "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен "
 "список пакетов, не прошедших проверку."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Невозможно установить '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -203,11 +206,11 @@ msgstr ""
 "ошибке. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Невозможно подобрать мета-пакет"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -220,15 +223,42 @@ msgstr ""
 " Для продолжения сначала установите один из приведенных выше пакетов с "
 "помощью synaptic или apt-get."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Не удалось получить"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Чтение кэша"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Не найдено действующее зеркало"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -248,11 +278,11 @@ msgstr ""
 "Ответ 'Нет' отменит обновление."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Сгенерировать источники по умолчанию?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -265,11 +295,11 @@ msgstr ""
 "\n"
 "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Информация о репозитории неверна"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -277,11 +307,11 @@ msgstr ""
 "В результате обновления информации о репозиториях образовался неверный файл. "
 "Пожалуйста отправьте отчет об ошибке."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Источники третьих сторон отключены"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -291,11 +321,11 @@ msgstr ""
 "обновления вы можете снова включить их с помощью утилиты 'software-"
 "properties' или synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Ошибка при обновлении"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -303,11 +333,11 @@ msgstr ""
 "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в "
 "сети, проверьте сетевые подключения и повторите попытку."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Недостаточно свободного места на диске"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -319,27 +349,31 @@ msgstr ""
 "предыдущих установок с помощью команды 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Вы хотите начать обновление системы?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Невозможно установить обновления"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Обновление прервано. Система, возможно, находится в неработоспособном "
 "состоянии. Запущено восстановление системы (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Невозможно загрузить обновления"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -347,11 +381,11 @@ msgstr ""
 "Обновление прервано. Проверьте соединение с Интернет или установочный диск и "
 "попробуйте снова. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Некоторые программы больше не поддерживаются официально"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -365,23 +399,23 @@ msgstr ""
 "Если у вас не подключен репозиторий 'universe', на следующем шаге вам "
 "предложат удалить эти пакеты. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Удалить устаревшие пакеты?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Пропустить этот шаг"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Ошибка при фиксировании"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -390,110 +424,101 @@ msgstr ""
 "ниже. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Восстановление первоначального состояния системы"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Проверка менеджера пакетов"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Обновление информации о репозитории"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Неверная информация о пакете"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "После обновления информации о пакетах, важный пакет '%s' не может быть "
 "найден.\n"
 "Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Запрос подтверждения"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Обновление"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Поиск устаревших программ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Обновление системы завершено."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Осталось приблизительно %li дней %li часов %li минут"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Осталось приблизительно %li часов %li минут"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Осталось приблизительно %li минут"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Осталось приблизительно %li секунд"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Пожалуйста, вставьте '%s' в устройство '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Загрузка завершена"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Обновление завершено"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Загрузка файла %li из %li со скоростью %s/с"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Осталось приблизительно %li минут"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Применение изменений"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Невозможно установить '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Обновление прервано. Пожалуйста, отправьте отчет об ошибке."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -502,18 +527,20 @@ msgstr ""
 "Заменить конфигурационный файл\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Не найдена команда 'diff'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Произошла неисправимая ошибка"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Пожалуйста отправьте отчет об ошибке и включите в него файлы /var/log/dist-"
@@ -522,7 +549,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -530,7 +557,7 @@ msgstr[0] "%s пакет будет удален."
 msgstr[1] "%s пакета будут удалены."
 msgstr[2] "%s пакетов будут удалены."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -538,7 +565,7 @@ msgstr[0] "%s новый пакет будет установлен."
 msgstr[1] "%s новых пакета будут установлены."
 msgstr[2] "%s новых пакетов будут установлены."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -546,52 +573,86 @@ msgstr[0] "%s пакет будет обновлен."
 msgstr[1] "%s пакета будут обновлены."
 msgstr[2] "%s пакетов будут обновлены."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Всего требуется загрузить %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Обновление может занять несколько часов и не может быть прервано в любой "
 "момент."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Чтобы избежать потерь данных, закройте все открытые приложения и документы."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Обновления не найдены"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Система уже обновлена."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Удалить %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Установить %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Обновить %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Осталось приблизительно %li дней %li часов %li минут"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Осталось приблизительно %li часов %li минут"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Требуется перезагрузка"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?"
@@ -644,7 +705,8 @@ msgid "Difference between the files"
 msgstr "Различие между файлами"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Загрузка и установка обновлений"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -664,26 +726,22 @@ msgid "Terminal"
 msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Обновление Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Оставить"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Отправить сообщение об ошибке"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "Перезапустить _сейчас"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Продолжить обновление"
 
@@ -704,46 +762,46 @@ msgid "Please check your internet connection."
 msgstr "Пожалуйста, проверьте соединение с интернет."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Невозможно запустить утилиту обновления"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Скорее всего это вызвано ошибкой в утилите обновления. Пожалуйста, сообщите "
 "об ошибке."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Загрузка утилиты обновления"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Утилита обновления будет направлять вас в процессе обновления."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Подпись утилиты обновления"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Утилита обновления"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Не удалось получить"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "Не удалось получить обновление. Возможно, возникла проблема в сети. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Не удалось извлечь"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -751,11 +809,11 @@ msgstr ""
 "Не удалось извлечь обновление. Возможно, возникла проблема в сети или на "
 "сервере. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Проверка не удалась"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -763,11 +821,11 @@ msgstr ""
 "Проверка обновления не удалась. Возможно, возникла проблема в сети или на "
 "сервере. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Проверка подлинности не удалась"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -785,18 +843,18 @@ msgstr "Загрузка файла %li из %li со скоростью %s/с"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Загрузка файла %li из %li с неизвестной скоростью"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -804,12 +862,40 @@ msgstr ""
 "Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с "
 "интернет."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Обновления безопасности Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Обновить систему до последней версии Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Установить обновления"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Невозможно установить все доступные обновления"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -819,30 +905,61 @@ msgstr ""
 "обновления системы используйте функцию \"Пометить все обновления\" менеджера "
 "пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get dist-upgrade\"."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Следующие обновления будут пропущены:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версия %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Загрузка списка изменений..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Размер загружаемых данных: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Ваша система не требует обновления"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -850,24 +967,35 @@ msgstr[0] "Вы можете установить %s обновление"
 msgstr[1] "Вы можете установить %s обновления"
 msgstr[2] "Вы можете установить %s обновлений"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Пожалуйста подождите, это может занять некоторое время."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Обновление завершено"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Новая версия: %s (Размер: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Версия %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Ваша версия Ubuntu больше не поддерживается"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -877,17 +1005,17 @@ msgstr ""
 "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для "
 "получения информации об обновлении посетите http://www.ubuntu.com"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Индекс программ поврежден"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1008,11 +1136,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Обновления в Интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Обновления в Интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1256,178 +1385,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Поддерживается сообществом (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Несвободное (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Несвободное (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Обновления безопасности Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Установить обновления"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Официально поддерживается"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Обновления Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Обновления Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Поддерживается сообществом (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Несвободное (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Официально поддерживается"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Ограниченные авторские права"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Обновления Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -1478,6 +1613,18 @@ msgstr "DFSG-совместимое ПО с зависимостями от не
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-совместимое ПО"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Осталось приблизительно %li секунд"
+
+#~ msgid "Download is complete"
+#~ msgstr "Загрузка завершена"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Обновление прервано. Пожалуйста, отправьте отчет об ошибке."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Обновление Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Скрыть подробности"
 
diff --git a/po/rw.po b/po/rw.po
index e4646d6f..acd54bf5 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:44+0000\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -75,7 +75,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -84,26 +84,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Ibihuzagihe bya porogaramumudasobwa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -147,54 +147,56 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -202,11 +204,11 @@ msgid ""
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +217,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -236,11 +264,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -249,43 +277,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "i Urufunguzo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -294,35 +322,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -331,219 +362,242 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Muyobozi ni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Byarangiye"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Amahinduka"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sisitemu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -591,7 +645,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -611,27 +665,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Kongera Gutangiza"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Byarangiye"
@@ -653,66 +703,66 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 #, fuzzy
 msgid "Upgrade tool"
 msgstr "Byarangiye"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -728,16 +778,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "ni a Gishya Bya Bihari"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -745,86 +795,155 @@ msgid ""
 msgstr ""
 "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "5"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Kwinjiza porogaramu"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 #, fuzzy
 msgid "The following updates will be skipped:"
 msgstr "OYA"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, fuzzy, python-format
 msgid "Version %s: \n"
 msgstr "Verisiyo \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Iyimura... i"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Sisitemu ni Hejuru Kuri Itariki"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Sisitemu ni Hejuru Kuri Itariki"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Verisiyo \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Ikwirakwiza... ni Oya"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -934,12 +1053,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<B B"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<B B"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1174,183 +1294,189 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "5"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Kigenga"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Kigenga"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Kwinjiza porogaramu"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "5"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "5"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 #, fuzzy
 msgid "Non-free (Multiverse)"
 msgstr "Kigenga"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 #, fuzzy
 msgid "Restricted copyright"
 msgstr "Uburenganzira bw'umuhimbyi"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "5"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "5"
@@ -1403,6 +1529,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<B B"
 
diff --git a/po/sk.po b/po/sk.po
index a85d7a7a..79e7857d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 17:32+0000\n"
 "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Aktualizácie softvéru"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Zdrojový"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Zdrojový"
@@ -140,11 +140,11 @@ msgstr "Prosím, zadajte názov disku"
 msgid "Please insert a disc in the drive:"
 msgstr "Prosím, vložte disk do mechaniky:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -152,33 +152,36 @@ 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Nemôžem aktualizovať požadované meta-balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Musel by byť odstránený dôležitý balík"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Nemôžem vypočítať aktualizáciu"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Počas prípravy aktualizácie sa vyskytol neriešiteľný problém. Nahláste to "
 "ako chybu. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Chyba pri overovaní niektorých balíkov"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,23 +191,23 @@ msgstr ""
 "problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam "
 "neoverených balíčkov."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nemôžem inštalovať '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Nemôžem odhadnúť meta balík."
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -217,15 +220,42 @@ msgstr ""
 "Pred pokračovaním nainštalujte jeden z vyššie uvedených balíkov pomocou "
 "Synapticu alebo apt-get."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Zlyhalo získavanie aktualizácie"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Čítam vyrovnávaciu pamäť cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Nebol nájdený vhodný server"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -245,11 +275,11 @@ msgstr ""
 "Pokiaľ zvolíte 'Nie', súbor nebude zmenený."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -263,11 +293,11 @@ msgstr ""
 "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor "
 "nebude zmenený."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Neplatná informácia o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -275,11 +305,11 @@ msgstr ""
 "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. "
 "Nahláste to ako chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Zdroje tretích strán sú zakázané"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -289,11 +319,11 @@ msgstr ""
 "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo "
 "pomocou synapticu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Chyba počas aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -301,11 +331,11 @@ msgstr ""
 "Počas aktualizácie sa objavil problém, ktorý je zvyčajne spôsobený chybou "
 "sieťového pripojenia, preto skontrolujte vaše pripojenie a skúste znova."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Nedostatok voľného miesta na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -317,27 +347,31 @@ msgstr ""
 "súborov z predchádzajúcich inštalácií pomocou príkazu 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Chcete začať s aktualizáciou?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Nebolo možné nainštalovať aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Aktualizácia teraz skončí. Váš systém môže byť v nepoužiteľnom stave, preto "
 "bol spustený príkaz na zotavenie sa z tohto stavu (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Nebolo možné stiahnuť požadované balíky"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -345,11 +379,11 @@ msgstr ""
 "Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové "
 "pripojenie alebo inštalačné médiá a skúste znova. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Niektoré programy už nie sú viac oficiálne podporované"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -363,23 +397,23 @@ msgstr ""
 "Pokiaľ nemáte zapnutý komunitou spravovaný zdroj softvéru 'universe', budú "
 "tieto balíky v ďalšom kroku navrhnuté na odstránenie. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Odstrániť zastarané balíky?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Preskočiť tento krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Chyba počas potvrdzovania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -388,110 +422,101 @@ msgstr ""
 "uvedené správy. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Obnovuje sa pôvodný stav systému"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Kontrola správcu balíkov"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Aktualizácia informácií o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Neplatná informácia o balíku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Po aktualizácií informácií o balíkoch nie je možné nájsť dôležitý balík '%"
 "s'.\n"
 "To znamená závažný problém. Nahláste to ako chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Požaduje sa potvrdenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Prebieha aktualizácia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Vyhľadávanie zastaraného softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Aktualizácia systému je dokončená."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Zostáva %li dní %li hodín %li minút"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Zostáva %li hodín %li minút"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Zostáva %li minút"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Zostáva %li sekúnd"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Prosím, vložte '%s' do mechaniky '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Sťahovanie je dokončené"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Aktualizácia je dokončená"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Sťahovanie súboru %li z %li pri %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Zostáva %li minút"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Sťahujem %li súbor z %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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Aplikujem zmeny"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nebolo možné nainštalovať '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Aktualizácia zlyhala. Oznámte to ako chybu."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -500,18 +525,20 @@ msgstr ""
 "Nahradiť konfiguračný súbor\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Príkaz 'diff' nebol nájdený."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Nastala závažná chyba"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Nahláste to ako chybu a k svojmu hláseniu priložte súbory /var/log/dist-"
@@ -522,7 +549,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -530,7 +557,7 @@ msgstr[0] "Bude odstránený %s balík."
 msgstr[1] "Budú odstránené %s balíky."
 msgstr[2] "Bude odstránených %s balíkov."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -538,7 +565,7 @@ msgstr[0] "Bude nainštalovaný %s nový balík."
 msgstr[1] "Budú nainštalované %s nové balíky."
 msgstr[2] "Bude nainštalovaných %s nových balíkov."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -546,50 +573,84 @@ msgstr[0] "Bude aktualizovaný %s balík."
 msgstr[1] "Budú aktualizované %s balíky."
 msgstr[2] "Bude aktualizovaných %s balíkov."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Musíte stiahnuť celkom %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Nemôžno nájsť žiadne aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Váš systém už bol aktualizovaný."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Odstrániť %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Inštalovať %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Aktualizovať %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Zostáva %li dní %li hodín %li minút"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Zostáva %li hodín %li minút"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Je potrebný reštart"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -645,7 +706,8 @@ msgid "Difference between the files"
 msgstr "Rozdiel medzi súbormi"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Sťahovanie a inštalovanie aktualizácií"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -665,26 +727,22 @@ msgid "Terminal"
 msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Aktualizuje sa Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Ponechať"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Oznámiť chybu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Reštartovať teraz"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Pokračovať v aktualizácii"
 
@@ -705,46 +763,46 @@ msgid "Please check your internet connection."
 msgstr "Skontrolujte si internetové pripojenie."
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Nebolo možné spustiť aktualizačný program"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Pravdepodobne je to chyba v aktualizačnom programe. Nahláste to ako chybu."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Sťahovanie aktualizačného programu"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "Aktualizačný program vás prevedie procesom aktualizácie."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Podpis aktualizačného programu"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Aktualizačný program"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Zlyhalo získavanie aktualizácie"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Zlyhalo získavanie aktualizácie, čo môže byť spôsobené sieťovým problémom. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Zlyhala extrakcia"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -752,11 +810,11 @@ msgstr ""
 "Nebolo možné rozbaliť aktualizáciu. Môže to byť spôsobené sieťovým problémom "
 "alebo nedostupňosťou servera. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Zlyhala verifikácia"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -764,11 +822,11 @@ msgstr ""
 "Zlyhala verifikácia aktualizácie. Môže to byť spôsobené sieťovým problémom "
 "alebo nedostupňosťou servera. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autentifikácia zlyhala"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -786,16 +844,16 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -803,12 +861,40 @@ msgstr ""
 "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové "
 "pripojenie."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Aktualizovať na najnovšiu verziu Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Nainštalovať _aktualizácie"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -819,30 +905,61 @@ msgstr ""
 "balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade\" v "
 "termináli."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Nasledujúce balíky nebudú aktualizované:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verzia %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Získava sa zoznam zmien..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Veľkosť na stiahnutie: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Váš systém je aktuálny"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -850,24 +967,35 @@ msgstr[0] "Môžete nainštalovať %s aktualizáciu"
 msgstr[1] "Môžete nainštalovať %s aktualizácie"
 msgstr[2] "Môžete nainštalovať %s aktualizácií"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Čakajte prosím, toto môže chvíľu trvať."
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Aktualizácia je dokončená"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Nová verzia: %s   (veľkosť: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Verzia %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Vaša distribúcia už nie je podporovaná"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -878,17 +1006,17 @@ msgstr ""
 "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu."
 "com.\""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Index softvéru je poškodený"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1010,11 +1138,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetové aktualizácie</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internetové aktualizácie</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1264,177 +1393,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Neslobodné (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Neslobodné (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Nainštalovať _aktualizácie"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Oficiálne podporované"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 - backporty"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 - backporty"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Neslobodné (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Oficiálne podporované"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "S obmedzujúcou licenciou"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 aktualizácie"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 - backporty"
@@ -1485,6 +1620,18 @@ msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére"
 msgid "Non-DFSG-compatible Software"
 msgstr "Softvér nekompatibilný s DFSG"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Zostáva %li sekúnd"
+
+#~ msgid "Download is complete"
+#~ msgstr "Sťahovanie je dokončené"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Aktualizácia zlyhala. Oznámte to ako chybu."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Aktualizuje sa Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Skryť podrobnosti"
 
diff --git a/po/sr.po b/po/sr.po
index 68f60b4a..9f207df9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-27 12:27+0000\n"
 "Last-Translator: Dejan Milosavljevic <dejan@wavebone.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -77,25 +77,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -135,64 +135,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +203,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -222,11 +250,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -235,42 +263,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -279,35 +307,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -316,154 +347,145 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -471,7 +493,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -479,7 +501,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -487,49 +509,82 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -576,7 +631,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -596,26 +651,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -636,64 +687,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -709,56 +760,112 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -766,41 +873,52 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -906,11 +1024,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1128,163 +1246,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 9c68eb2e..f204ba57 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:18+0000\n"
 "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, fuzzy, python-format
 msgid "Server for %s"
 msgstr "Server"
@@ -76,28 +76,28 @@ msgstr "Server"
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Programvaruuppdateringar"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 #, fuzzy
 msgid "Active"
 msgstr "Aktivera"
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Källkod"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Källkod"
@@ -143,11 +143,11 @@ msgstr "Skriv in ett namn på skivan"
 msgid "Please insert a disc in the drive:"
 msgstr "Sätt in en skiva i enheten:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -156,33 +156,36 @@ msgstr ""
 "programmet. Reparera dem först med synaptic eller apt-get innan du "
 "fortsätter."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Kan inte uppdatera obligatoriska meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Ett grundläggande paket skulle behöva tas bort"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Kunde inte beräkna uppdateringen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Ett problem som inte gick att lösa uppstod när uppdateringen beräknades. Var "
 "vänlig rapportera detta som en bugg. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Det gick inte att autentisiera vissa paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
@@ -192,12 +195,12 @@ msgstr ""
 "nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista "
 "med icke autentisierade paket."
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan inte installera \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -206,11 +209,11 @@ msgstr ""
 "rapportera detta som en bugg. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Kan inte gissa meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -224,15 +227,42 @@ msgstr ""
 " Installera ett av dessa paket med synaptic eller apt-get innan du "
 "fortsätter."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "Misslyckades med att hämta"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Läser cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Hittade ingen giltig serverspegel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -252,11 +282,11 @@ msgstr ""
 "Om du väljer \"nej\" kommer uppdateringen avbrytas."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "Lägg till standardförråd?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -269,11 +299,11 @@ msgstr ""
 "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer "
 "uppdateringen avbrytas."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Information om förråd ogiltig"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -281,11 +311,11 @@ msgstr ""
 "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig "
 "rapportera detta som en bugg."
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Tredjepartskällor inaktiverade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -295,11 +325,11 @@ msgstr ""
 "aktivera dem efter uppgraderingen med verktyget \"software-properties\" "
 "eller med synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Fel vid uppdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -308,11 +338,11 @@ msgstr ""
 "av nätverksproblem, var god kontrollera din nätverksanslutning och försök "
 "igen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Inte tillräckligt med ledigt diskutrymme"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -324,27 +354,31 @@ msgstr ""
 "använda 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Vill du starta uppdateringen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Det gick inte att installera uppgraderingarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. "
 "En återställning kördes (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Det gick inte ladda ner uppgraderingarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -352,11 +386,11 @@ msgstr ""
 "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller "
 "ditt installationsmedia och försök igen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "Viss programvara har inte längre officiellt stöd"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -368,23 +402,23 @@ msgstr ""
 "gemenskapsunderhållna ('universe').Om du inte har 'universe' aktiverat "
 "kommer dessa paket föreslås för borttagning i nästa steg. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "Ta bort föråldrade paket?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_Hoppa över det här steget"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "Fel inträffade vid utförandet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -393,110 +427,101 @@ msgstr ""
 "information. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "Återställer systemstatus"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Kontrollerar pakethanterare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Uppdaterar förrådsinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Ogiltig paketinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "Efter att paketinformationen uppdaterades går det inte att hitta det "
 "nödvändiga paketet \"%s\" längre.\n"
 "Det här tyder på ett alvarligt fel, var god och rapportera detto som en bugg."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Ber om bekräftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Uppgraderar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Söker efter föråldrad mjukvara"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Systemuppdateringen är klar."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "Omkring %li dagar, %li timmar och %li minuter återstår"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "Omkring %li timmar och %li minuter återstår"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "Omkring %li minuter återstår"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "Omkring %li sekunder återstår"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Mata in \"%s\" i enheten \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "Hämtningen är färdig"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "Uppdateringen är färdig"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Hämtar hem fil %li av %li i %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "Omkring %li minuter återstår"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 msgstr "Laddar ner fil %li av %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "Verställer ändringar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Kunde inte installera \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Uppdateringen avbryts nu. Var vänlig rapportera detta som en bugg."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -505,18 +530,20 @@ msgstr ""
 "Ersätt konfigurationsfil\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "Kommandot \"diff\" hittades inte"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Ett kritiskt fel uppstod"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Var god och rapportera detta som en bugg och inkludera filerna /var/log/dist-"
@@ -526,71 +553,105 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s paket kommer att tas bort."
 msgstr[1] "%s paket kommer att tas bort."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s nytt paket kommer att installeras."
 msgstr[1] "%s nya paket kommer att installeras."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s paket kommer att uppgraderas."
 msgstr[1] "%s paket kommer att uppgraderas."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Du behöver ladda ner totalt %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Stäng alla öppna program och dokument för att undvika dataförlust."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Kunde inte hitta några uppgraderingar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Ditt system har redan uppgraderats."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Ta bort %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "Installera %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "Uppgradera %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "Omkring %li dagar, %li timmar och %li minuter återstår"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "Omkring %li timmar och %li minuter återstår"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, fuzzy, python-format
+msgid "%li seconds"
+msgstr "sekunder"
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Omstart krävs"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -645,7 +706,8 @@ msgid "Difference between the files"
 msgstr "Skillnad mellan filerna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Hämtar och installerar uppgraderingarna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -665,26 +727,22 @@ msgid "Terminal"
 msgstr "Terminalfönster"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Uppgraderar Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "_Behåll"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_Rapportera bugg"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Starta om nu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_Återuppta uppgraderingen"
 
@@ -705,49 +763,49 @@ msgid "Please check your internet connection."
 msgstr "Kontrollera din internetanslutning"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "Det gick inte att köra uppdateringsverktyget"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Det är troligen en bugg i uppdateringsverktyget. Var god rapportera det som "
 "en bugg."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "Hämtar uppdateringsverktyget"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 "Uppdateringsverktyget kommer att guida dig genom uppdateringsprocessen."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "Uppdateringsverktygets signatur"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "Uppdateringsverktyg"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "Misslyckades med att hämta"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Hämtningen av uppdateringen misslyckades. Det kan vara ett problem med "
 "nätverket. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "Misslyckades med att packa upp"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -755,11 +813,11 @@ msgstr ""
 "Uppackningen av uppdateringen misslyckades. Det kan vara ett problem med "
 "nätverket eller servern. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Kontrollen misslyckades"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
@@ -767,11 +825,11 @@ msgstr ""
 "Kontrollen av uppdateringen misslyckades. Det kan vara ett problem med "
 "nätverket eller servern. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -789,16 +847,16 @@ msgstr "Hämtar hem fil %li av %li i %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Hämtar hem fil %li av %li med okänd hastighet"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
@@ -806,12 +864,41 @@ msgstr ""
 "Misslyckades med att hämta listan med ändringar. Kontrollera din "
 "internetanslutning."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
+
+#: ../UpdateManager/UpdateManager.py:220
+#, fuzzy
+msgid "Recommended updates of Ubuntu"
+msgstr "%d uppdateringar"
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Uppdatera till senaste versionen av Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Uppdateringar"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "Det går inte att installera alla tillgängliga uppdateringar"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -822,54 +909,98 @@ msgstr ""
 "kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera ditt "
 "system helt och hållet."
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "Följande uppdateringar kommer att hoppas över"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "Hämtar lista med ändringar..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr "Markera _inga"
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr "Markera _alla"
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+#, fuzzy
+msgid "None"
+msgstr "en"
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+#, fuzzy
+msgid "1 KB"
+msgstr "%d kB"
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, fuzzy, python-format
+msgid "%.0f KB"
+msgstr "%.2f MB"
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, fuzzy, python-format
+msgid "%.1f MB"
+msgstr "%.2f MB"
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "Nerladdningsstorlek: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "Ditt system är uppdaterat"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Du kan installera %s uppdatering"
 msgstr[1] "Du kan installera %s uppdateringar"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "Var god vänta, det här kan ta lite tid"
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "Uppdateringen är färdig"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "Ny version: %s (Storlek: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Version %s:"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, fuzzy, python-format
+msgid "(Size: %s)"
+msgstr "Storlek:"
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribution stöds inte längre"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -879,17 +1010,17 @@ msgstr ""
 "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer "
 "information om att uppgradera."
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "Indexet för program är trasigt"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1012,11 +1143,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetuppdateringar</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internetuppdateringar</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1265,179 +1397,185 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Gemenskapsunderhållen (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Ickefri (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Ickefri (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 #, fuzzy
 msgid "Recommended updates"
 msgstr "%d uppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "%d uppdateringar"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 #, fuzzy
 msgid "Backported updates"
 msgstr "%d uppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Stöds officiellt"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Uppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Bakåtportar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Uppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Bakåtportar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Gemenskapsunderhållen (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Ickefri (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "Stöds officiellt"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Begränsad upphovsrätt"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Uppdateringar"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Bakåtportar"
@@ -1488,6 +1626,18 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden"
 msgid "Non-DFSG-compatible Software"
 msgstr "Inte DFSG-kompatibel programvara"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Omkring %li sekunder återstår"
+
+#~ msgid "Download is complete"
+#~ msgstr "Hämtningen är färdig"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Uppdateringen avbryts nu. Var vänlig rapportera detta som en bugg."
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Uppgraderar Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "Dölj detaljer"
 
@@ -1870,9 +2020,6 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "User Interface"
 #~ msgstr "Användargränssnitt"
 
-#~ msgid "Version %s:"
-#~ msgstr "Version %s:"
-
 #~ msgid "New version:"
 #~ msgstr "Ny version"
 
@@ -2045,15 +2192,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Quit"
 #~ msgstr "Avsluta"
 
-#~ msgid "Select _All"
-#~ msgstr "Markera _alla"
-
 #~ msgid "Select all items"
 #~ msgstr "Markera alla objekt"
 
-#~ msgid "Select _None"
-#~ msgstr "Markera _inga"
-
 #~ msgid "Deselect all items"
 #~ msgstr "Avmarkera alla objekt"
 
@@ -2877,9 +3018,6 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Username"
 #~ msgstr "Användarnamn"
 
-#~ msgid "%d KB"
-#~ msgstr "%d kB"
-
 #~ msgid "%d kB"
 #~ msgstr "%d kB"
 
@@ -3368,9 +3506,6 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Installed Version:"
 #~ msgstr "Installerad version:"
 
-#~ msgid "Size:"
-#~ msgstr "Storlek:"
-
 #~ msgid "bytes"
 #~ msgstr "byte"
 
@@ -3511,9 +3646,6 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Verification Log"
 #~ msgstr "Verifieringslogg"
 
-#~ msgid "%.2f MB"
-#~ msgstr "%.2f MB"
-
 #~ msgid "%d bytes"
 #~ msgstr "%d byte"
 
@@ -3544,9 +3676,6 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "zero"
 #~ msgstr "noll"
 
-#~ msgid "one"
-#~ msgstr "en"
-
 #~ msgid "two"
 #~ msgstr "två"
 
@@ -3611,9 +3740,6 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Allowed cache difference:"
 #~ msgstr "Tillåten cacheskillnad:"
 
-#~ msgid "seconds"
-#~ msgstr "sekunder"
-
 #~ msgid "<b>%d</b> %s"
 #~ msgstr "<b>%d</b> %s"
 
diff --git a/po/th.po b/po/th.po
index ad26059c..b74c14ea 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-24 16:44+0000\n"
 "Last-Translator: Roys Hengwatanakul <roysheng@msn.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,26 +75,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "ซอฟต์แวร์ปรับปรุง"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -137,11 +137,11 @@ msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิ
 msgid "Please insert a disc in the drive:"
 msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "แพกเกจเสียหาย"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -149,31 +149,34 @@ msgstr ""
 "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic "
 "หรือ apt-get ก่อนดำเนินการต่อไป"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "แพจเกจที่สำคัญจะถูกลบออก"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "ไม่สามารถคำนวนการปรับปรุงได้"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -182,23 +185,23 @@ msgstr ""
 "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย "
 "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน"
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "ไม่สามารถติดตั้ง  '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -211,15 +214,42 @@ msgstr ""
 "กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get "
 "ก่อนดำเนินการต่อไป"
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "ไม่สามารถเอามาได้"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "กำลังอ่านจากที่เก็บชั่วคราว"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -238,11 +268,11 @@ msgstr ""
 "ถ้าคุณเลือก  'no' การปรับปรุงจะถูกยกเลิก"
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "สร้าง default sources?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -254,21 +284,21 @@ msgstr ""
 "\n"
 "ควรเพิ่มรายการสำหรับ  '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก"
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา"
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "แหล่งอื่นๆใช้ไม่ได้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -278,11 +308,11 @@ msgstr ""
 "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' "
 "หรือด้วยโปรแกรม synaptic"
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "เกิดข้อผิดพลาดขณะปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -290,11 +320,11 @@ msgstr ""
 "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย "
 "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที"
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -305,27 +335,31 @@ msgstr ""
 "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "ไม่สามารถปรับปรุงได้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --"
 "configure -a)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -333,11 +367,11 @@ msgstr ""
 "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation "
 "mediaและลองอีกครั้ง "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -350,133 +384,124 @@ msgstr ""
 "\\n\n"
 "ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "_ข้ามขั้นตอนนี้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "เ_อาออก"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "เริ่มระบบใหม่อีกครั้ง"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n"
 "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา"
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "_ถามการยืนยันจากคุณก่อน"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "กำลังปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "ปรับปรุงระบบเสร็จแล้ว"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "เหลือประมาณ %li วัน %li ชั่วโมง %li นาที"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "เหลือประมาณ %li ชั่วโมง %li นาที"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "เหลือประมาณ %li นาที"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "เหลือประมาณ %li วินาที"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "กรุณาใส่  '%s' เข้าไปในเครื่องเล่น  '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "ดาวน์โหลดเสร็จแล้ว"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ที่ %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "เหลือประมาณ %li นาที"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "กำลังเปลี่ยนแปลง"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "ไม่สามารถติดตั้ง '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "การปรัปรุงถูกยกเลิก กรุณารายงานปัญหานี้"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -485,18 +510,20 @@ msgstr ""
 "เปลี่ยนไฟล์ปรับแต่ง\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "ไม่เจอคำสั่ง  'diff'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "กรุณารายงานว่าเป็นปัญหาและส่งไฟล์ /var/log/dist-upgrade.log and /var/log/dist-"
@@ -505,67 +532,101 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s แพกเกจจะถูกลบออก"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s แพกเกจใหม่จะถูกติดตั้ง"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s แพกเกจจะถูกปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "คุณจะต้องดาวน์โหลดทั้งหมด  %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "การปรับปรุงอาจจะใช้เวลานานหลายชั่วโมงและไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "ไม่มีอะไรให้ปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>ลบออก %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "ติดตั้ง  %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "ปรับปรุงรุ่น %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "เหลือประมาณ %li วัน %li ชั่วโมง %li นาที"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "เหลือประมาณ %li ชั่วโมง %li นาที"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "ต้องเริ่มระบบใหม่"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?"
@@ -616,7 +677,8 @@ msgid "Difference between the files"
 msgstr "ข้อแตกต่างระหว่างไฟล์"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "กำลังดาวน์โหลดและทำการปรับปรุง"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -636,26 +698,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "แ_ทนที่"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "_ส่งรายงานปัญหา"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "เ_ริ่มระบบใหม่เดี๋ยวนี้"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
 
@@ -676,64 +734,64 @@ msgid "Please check your internet connection."
 msgstr "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "ไม่สามารถเรียกใช้เครื่องมือปรับปรุง"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "นี่น่าจะเป็นปัณหาของเครื่องปรับปรุง กรุณารายงานว่าเป็นปัญหา"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "กำลังดาวน์โหลดเครื่องมือปรับปรุง"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "เครื่องปรับปรุงจะนำคุณตลอดกระบวนการปรับปรุง"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "รายเซ็นของเครื่องมือปรับปรุง"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "เครื่องมือปรับปรุงรุ่น"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "ไม่สามารถเอามาได้"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงได้ อาจจะเป็นปัญหาในเครือข่าย "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "ไม่สามารถเอาออกมาได้"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr "ไม่สามารถแกะข้อมูลปรับปรุงออกมาได้ อาจจะเป็นปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "ไม่สามารถตรวจเช็คความถูกต้องได้"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "ไม่สามารถยืนยันว่าเป็นของจริงได้"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -749,28 +807,56 @@ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "อูบันตู 5.10 Security Updates"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "_ติดตั้งปรัยปรุง"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -780,53 +866,95 @@ msgstr ""
 "ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง  \"sudo apt-get dist-upgrade\" "
 "ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์"
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "การปรับปรุงต่อไปนี้จะถูกข้ามไป:"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "รุ่น %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "ขนาดดาวน์โหลด: %s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "ระบบของคุณทันสมัยแล้ว"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย"
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "รุ่นใหม่: %s   (ขนาด: %s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "รุ่น %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -836,17 +964,17 @@ msgstr ""
 "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com "
 "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "ดัชนีของซอฟแวร์เสียหาย"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -963,11 +1091,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1205,178 +1334,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "อูบันตู 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "อูบันตู 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "_ติดตั้งปรัยปรุง"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "สนับสนุนอย่างเป็นทางการ"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "อูบันตู 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "อูบันตู 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "อูบันตู 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "อูบันตู 5.10 Backports"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "สนับสนุนอย่างเป็นทางการ"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "จำกัดลิขสิทธิ์"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "อูบันตู 5.10 Updates"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "อูบันตู 5.10 Backports"
@@ -1427,6 +1562,18 @@ msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอ
 msgid "Non-DFSG-compatible Software"
 msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "เหลือประมาณ %li วินาที"
+
+#~ msgid "Download is complete"
+#~ msgstr "ดาวน์โหลดเสร็จแล้ว"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "การปรัปรุงถูกยกเลิก กรุณารายงานปัญหานี้"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "ปรับปรุงรุ่นอูบันตู"
+
 #~ msgid "Hide details"
 #~ msgstr "ซ่อนรายละเอียด"
 
diff --git a/po/tr.po b/po/tr.po
index 3432b48b..7b802529 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Özgur KIRCALI <okircali@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Kanal Düzenle"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgstr "Lütfen disk için bir isim girin"
 msgid "Please insert a disc in the drive:"
 msgstr "Lütfen sürücüye bir disk yerleştirin:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Bozuk paketler"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -150,54 +150,56 @@ msgstr ""
 "Sisteminiz bu yazılım ile düzeltilemeyen bozuk paketler içeriyor. Devam "
 "etmeden önce lütfen bunları synaptic veya apt-get kullanarak düzeltin."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' yüklenemiyor"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "Gerekli bir paket yüklenemedi. Lütfen bunu bir hata olarak bildirin. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -210,15 +212,41 @@ msgstr ""
 " Lütfen devam etmeden önce, synaptic veya apt-get kullanarak yukarıdaki "
 "paketlerden birini kurun."
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Önbellek okunuyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "Geçerli yansı bulunamadı"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -231,11 +259,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -248,32 +276,32 @@ msgstr ""
 "'%s' için varsayılan girişler eklensin mi? Eğer 'Hayır'ı seçerseniz, "
 "güncelleştirme iptal edilecektir."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "Üçüncü parti kaynaklar devredışı bırakıldı"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "Güncelleştirme sırasında hata"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -281,11 +309,11 @@ msgstr ""
 "Güncelleştirme sırasında bir hata oluştu. Bu genellikle bir ağ sorunudur, "
 "lütfen ağ bağlantınızı kontrol edin ve yeniden deneyin."
 
-#: ../DistUpgrade/DistUpgradeControler.py:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Yeterince boş disk alanı yok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -294,25 +322,28 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Yükseltmeyi başlatmak istiyor musunuz?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Yükseltmeler kurulamadı"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Yükseltmeler indirilemedi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -320,11 +351,11 @@ msgstr ""
 "Yükseltme şimdi iptal edilecek. Lütfen internet bağlantınızı veya kurulum "
 "ortamınızı kontrol edin ve yeniden deneyin. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -333,214 +364,239 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "Bu Adımı _Atla"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "Geçersiz paket bilgisi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "Yükseltiliyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Sistem yükseltmesi tamamlandı."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
 msgstr "İndirme tamamlandı"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s' kurulamadı"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Yükseltme şimdi iptal edilecek. Lütfen bu hatayı bildirin."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "'diff' komutu bulunamadı"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Sisteminiz zaten yükseltilmiş."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "%s'i kur"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s'i yükselt"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Yeniden başlatma gerekiyor"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -592,8 +648,9 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
-msgstr ""
+#, fuzzy
+msgid "Fetching and installing the upgrades"
+msgstr "Yükseltmeler kurulamadı"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -612,26 +669,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -652,64 +705,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -725,96 +778,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
+#, python-format
+msgid "From version %s to %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:835
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "Version %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -920,11 +1041,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1148,174 +1269,179 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "Resmi olarak desteklenenler"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Resmi olarak desteklenenler"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Sınırlı telif hakkı"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
@@ -1366,6 +1492,9 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Yükseltme şimdi iptal edilecek. Lütfen bu hatayı bildirin."
+
 #~ msgid "     "
 #~ msgstr "     "
 
diff --git a/po/uk.po b/po/uk.po
index 4f9d4477..5049ce5f 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,27 +76,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Оновлення програм"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Текст програми"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Текст програми"
@@ -137,11 +137,11 @@ msgstr "Введіть назву диску"
 msgid "Please insert a disc in the drive:"
 msgstr "Вставте диск в пристрій:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "Пошкоджені пакунки"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -149,44 +149,46 @@ msgstr ""
 "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені "
 "цією програмою. Скористайтесь перш програмами synaptic чи apt-get."
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "Не можливо поновити необхідні meta-пакунки"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "Це призведе довидалення базового пакунку системи"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "Не можливо розрахувати поновлення"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "Помилка підписів в деяких пакунках"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Не можливо встановити '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -194,11 +196,11 @@ msgid ""
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "Не можливо підібрати meta-пакунок"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -207,16 +209,42 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "Зчитування кешу"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 #, fuzzy
 msgid "No valid mirror found"
 msgstr "Не знайдено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -229,11 +257,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -242,43 +270,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "Помилка в даних про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Помилка підчас поновлення"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "Недостатньо місця на диску"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -287,29 +315,32 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "Бажаєте почати апгрейд системи?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "Неможливо провести апргрейд системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 #, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Апргрейд системи щойно зупинено. Система тепер може працювати нестабільно. "
 "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою "
 "Synaptic для налаштування системи."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "Неможливо завантажити пакунки для апргрейду системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -317,11 +348,11 @@ msgstr ""
 "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з "
 "інтернетом чи носії та спробуйте знов. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -330,24 +361,24 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 #, fuzzy
 msgid "Remove obsolete packages?"
 msgstr "Видалити непотрібні пакунки?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -356,130 +387,121 @@ msgstr ""
 "нижче. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "Перезавантаження системи"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "Перевірка програми управління пакунками"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "Отримання інформації про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "Запит підтвердження"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Оновлення завершено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "Пошук програм, що не використовуються"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "Апргрейд системи завершено."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Вставте '%s' в пристрій '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
 msgstr "Завантадення пакунків завершено"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "Завантажується файл %li of %li at %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "About %s remaining"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
+msgstr "Завантажується файл %li of %li at %s/s"
+
 #. 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Завантаження змін..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Не можливо встановити '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "Виникла невиправна помилка"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 #, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-"
@@ -487,7 +509,7 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -495,7 +517,7 @@ msgstr[0] "%s пакунків буде видалено."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -503,7 +525,7 @@ msgstr[0] "%s пакунків буде встановлено."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -511,51 +533,85 @@ msgstr[0] "буде проведено апргрейд %s пакунків."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "Потрібно завантажити всього %s пакунків."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом "
 "всього часу."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "Не знайдено пакунків для апгрейду"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "Апгрейд вашої системи вже проведено."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Видалити %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "Встановити %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Апргрейд %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "Необхідно перезавантажити систему"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -606,7 +662,8 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "Завантаження та встановлення пакунків для апгрейду"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -626,27 +683,23 @@ msgid "Terminal"
 msgstr "Термінал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "Апгрейд системи Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Перезавантажити"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "П_овідомити про помилку"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "_Перезавантажити"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "П_родовжити апгрейд системи"
 
@@ -669,69 +722,69 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 #, fuzzy
 msgid "Could not run the upgrade tool"
 msgstr "Неможливо провести апргрейд системи"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "Завантаження та встановлення пакунків для апгрейду"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 #, fuzzy
 msgid "Upgrade tool"
 msgstr "Апргрейд %s"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Аутентифікація"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -747,16 +800,16 @@ msgstr "Завантажується файл %li of %li at %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Завантажується файл %li of %li на невизначенії швидкості"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Доступний новий випуск Ubuntu!"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -764,45 +817,104 @@ msgid ""
 msgstr ""
 "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Оновлення безпеки Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
 #, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "Апгрейд системи Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Встановлення оновлень..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
+#, fuzzy
 msgid "Cannot install all available updates"
 msgstr "Пошук пакунків для апгрейду"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версія %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Завантаження змін"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Ваша система оновлена!"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -810,43 +922,54 @@ msgstr[0] "Неможливо провести апргрейд системи"
 msgstr[1] "Неможливо провести апргрейд системи"
 msgstr[2] "Неможливо провести апргрейд системи"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 #, fuzzy
 msgid "Update is complete"
 msgstr "Завантадення пакунків завершено"
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
+#, python-format
+msgid "From version %s to %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Версія %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Ваш дистрибутив вже не підтримується"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -955,12 +1078,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Оновлення через Інтернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Оновлення через Інтернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1202,181 +1326,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Оновлення Ubuntu 5.04"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Не-вільний (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Не-вільний (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Оновлення Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Оновлення безпеки Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Встановлення оновлень..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Офіціально підтримуються"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Оновлення безпеки Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Оновлення безпеки Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Оновлення Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Не-вільний (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Офіціально підтримуються"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Обмежені авторські права"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Оновлення безпеки Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Оновлення Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Оновлення Ubuntu 5.10"
@@ -1430,6 +1560,13 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Download is complete"
+#~ msgstr "Завантадення пакунків завершено"
+
+#, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
+
 #, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Подробиці</b>"
diff --git a/po/update-manager.pot b/po/update-manager.pot
index e3c9c7b9..9cea7704 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -134,64 +134,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +202,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -221,11 +249,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -234,42 +262,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -278,35 +306,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -315,217 +346,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -572,7 +627,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -592,26 +647,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -632,64 +683,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -705,97 +756,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -901,11 +1019,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1123,163 +1241,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/ur.po b/po/ur.po
index 6b15c85d..aa76eddb 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-19 02:46+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -135,64 +135,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +203,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -222,11 +250,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -235,42 +263,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -279,35 +307,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -316,217 +347,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -573,7 +628,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -593,26 +648,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -633,64 +684,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -706,97 +757,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -902,11 +1020,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1125,163 +1243,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/urd.po b/po/urd.po
index ec89cf4b..6629ac1c 100644
--- a/po/urd.po
+++ b/po/urd.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-07 01:53+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,25 +76,25 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 msgid "Software Channel"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -135,64 +135,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +203,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -222,11 +250,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -235,42 +263,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -279,35 +307,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -316,217 +347,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li hours %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -573,7 +628,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -593,26 +648,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -633,64 +684,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -706,97 +757,164 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+msgid "Important security updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+msgid "Other updates"
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -902,11 +1020,11 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1125,163 +1243,168 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+msgid "Proposed updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index e7235f90..849598ae 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,27 +75,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Bản cập nhật phần mềm"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "Nguồn"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "Nguồn"
@@ -136,54 +136,56 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "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:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -191,11 +193,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:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -204,15 +206,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -225,11 +253,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -238,43 +266,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "Gặp lỗi khi gỡ bỏ khóa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -283,35 +311,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -320,218 +351,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Một bộ quản lý gói khác đang chạy"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "Nâng cấp xong"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "Đang tài về các thay đổi..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, 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:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -579,7 +633,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -599,27 +653,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "Tải lại"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -640,67 +690,67 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "Đang tải các thay đổi"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Xác thực"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -716,16 +766,16 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Có một bản phát hành Ubuntu mới công bố."
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
@@ -734,86 +784,155 @@ 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."
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Đang cài đặt bản cập nhật..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Cannot install all available updates"
 msgstr "Đang kiểm tra có cập nhật..."
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "Phiên bản %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Đang tải các thay đổi"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Hệ thống bạn toàn mới nhất."
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "Phiên bản %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Không còn hỗ trợ lại bản phát hành của bạn."
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -922,12 +1041,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Cập nhật dùng Mạng</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>Cập nhật dùng Mạng</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1166,181 +1286,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Đang cài đặt bản cập nhật..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "Bản quyền bị giới hạn"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Bản cập nhật Ubuntu 4.10"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
@@ -1395,6 +1521,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, 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."
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>Chi tiết</b>"
 
diff --git a/po/xh.po b/po/xh.po
index 05af4f99..590257a2 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-04-20 19:15+0000\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -76,26 +76,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "Bonisa izihlaziyo"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -135,64 +135,66 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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,15 +203,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -222,11 +250,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -235,42 +263,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -279,35 +307,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -316,217 +347,241 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -573,7 +628,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -593,26 +648,22 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -633,64 +684,64 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -706,98 +757,167 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Kukho i-%i yohlaziyo ekhoyo"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr ""
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Bonisa izihlaziyo"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "Bonisa izihlaziyo"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
+#, python-format
+msgid "From version %s to %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:835
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -905,12 +1025,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet</b>"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1132,164 +1253,170 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 msgid "Community maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "Bonisa izihlaziyo"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -1355,10 +1482,6 @@ msgstr ""
 #~ msgstr "     "
 
 #, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
-
-#, fuzzy
 #~ msgid "<b>Components</b>"
 #~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f2881f39..b0d5d452 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-30 14:16+0000\n"
 "Last-Translator: catinsnow <catinsnow@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,29 +75,29 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "软件更新"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr ""
 "二进制\n"
 "源代码"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr ""
@@ -143,11 +143,11 @@ msgstr "请输入光盘的名称"
 msgid "Please insert a disc in the drive:"
 msgstr "请将光盘插入到光驱里:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "破损的软件包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -155,31 +155,34 @@ msgstr ""
 "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者"
 "apt-get修复它们。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "不能升级要求的元包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "一个必要的软件包会被删除"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "无法计算升级"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "在认证一些软件包时出错"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -188,23 +191,23 @@ msgstr ""
 "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软"
 "件包的列表。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "无法安装'%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "无法安装要求的软件包。请汇报这个bug。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "无法猜出元包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -216,15 +219,42 @@ msgstr ""
 "确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中"
 "的一个。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "下载失败"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "正在读取缓存"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "未找到可用的镜像"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -241,11 +271,11 @@ msgstr ""
 "如果选'no'更新将被取消."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "生成默认的源?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -257,21 +287,21 @@ msgstr ""
 "\n"
 "添加用于'%s'的缺省条目?如果选择'No',升级将被取消."
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "源的信息无效"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "第三方源被禁用"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -280,21 +310,21 @@ msgstr ""
 "源列表中一些第三方源被禁用.你可以在升级后用\"软件属性\"工具或新立得包管理器来"
 "重新启用它们."
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "升级时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "磁盘空间不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -305,37 +335,41 @@ msgstr ""
 "get clean'命令来删除之前安装的临时软件包。"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "你要开始升级么？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "无法安装升级"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -"
 "a)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "无法下载升级包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "一些软件已经不在被官方支持."
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -347,132 +381,123 @@ msgstr ""
 "\n"
 "如果你没有启用'社区维护'源,下一步这些包将被建议移除. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "删除陈旧的软件包？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "跳过这个步骤(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "确认时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr "在清理时发生问题。更多信息请查看以下消息。 "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "正在恢复原始系统状态"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "正在检查软件包管理器"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "更新源的信息"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "无效的包信息"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:583
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 "包信息被更新后核心包'%s'没有找到.\n"
 "这标志着一个严重的错误,请报告bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "请求确认"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "正在更新"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "寻找陈旧的软件包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "系统更新完毕"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr "大约还要%li天%li小时%li分钟"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr "大约还要%li天%li小时"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr "大约还要%li分钟"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr "大约还要%li秒"
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "请将'%s'插入光驱'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "下载完成"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "更新完成"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "正在下载文件%li/%li速度是%s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
-#, python-format
-msgid "Downloading file %li of %li"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#, fuzzy, python-format
+msgid "About %s remaining"
+msgstr "大约还要%li分钟"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "正在应用更新"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "无法安装'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "升级被取消。请报告这个bug。"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -481,18 +506,20 @@ msgstr ""
 "替换配置文件\n"
 "“%s”吗？"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "外部命令“diff”没有找到"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "出现致命错误"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "请报告这个bug并在你的报告中包括文件~/dist-upgrade.log和~/dist-upgrade-apt."
@@ -501,67 +528,101 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s软件包将被删除。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s新的软件包将被安装。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s软件包将被升级"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "你下载了总体的%s。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "升级会持续几个小时且不能在稍后的任何时候被终止"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "关闭所有打开的程序和文档以防止数据丢失。"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "不能找到任何升级"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "你的系统已经升级。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>删除%s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "安装%s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "升级%s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, fuzzy, python-format
+msgid "%li days %li hours %li minutes"
+msgstr "大约还要%li天%li小时%li分钟"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, fuzzy, python-format
+msgid "%li hours %li minutes"
+msgstr "大约还要%li天%li小时"
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "需要重启"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "升级已经完成并需要重启。你要现在重启么？"
@@ -612,7 +673,8 @@ msgid "Difference between the files"
 msgstr "文件之间的区别"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "下载并安装升级"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -632,26 +694,22 @@ msgid "Terminal"
 msgstr "终端"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "正在升级Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "维持原状(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "报告Bug(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "现在重启(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "继续升级(_R)"
 
@@ -672,64 +730,64 @@ msgid "Please check your internet connection."
 msgstr "请检查你的互联网连接。"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "不能运行升级工具"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "这很可能是升级工具的一个bug。请汇报这个bug。"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "下载升级工具"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "升级工具将引导你完成升级过程。"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "升级工具签名"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "升级工具"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "下载失败"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "获取升级信息失败。可能网络有问题。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "提取失败"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr "提取升级信息失败。可能是网络或服务器的问题。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "验证失败"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr "验证升级程序失败。可能是网络或服务器的问题。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -745,27 +803,55 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "正在下载文件 %li/%li 速度未知"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "变动列表尚不可用。请稍后再试。"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "变动列表尚不可用。请稍后再试。"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "无法下载更新列表。请检查您的网络连接。"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 安全更新"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "升级到最新版本的Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "安装更新"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "无法安装所有升级"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -774,53 +860,95 @@ msgstr ""
 "一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并运"
 "行 “sudo apt-get dist-upgrade”来彻底更你新的系统。"
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "将跳过以下的升级包"
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "正在下载更新列表..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "下载文件大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "你可以安装 %s 个更新"
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "请稍等，这需要花一些时间。"
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "更新完成"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "新版本：%s(大小：%s)"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "版本 %s： \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "您的发行版不再被支持"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -830,17 +958,17 @@ msgstr ""
 "\r\n"
 "http://www.ubuntu.com 来获取更多有关升级的信息。"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>新发行版 '%s' 可用</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "软件索引已被破坏"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -957,11 +1085,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet 更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>Internet 更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1206,177 +1335,183 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6-06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "社区维护(Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "非自由(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "非自由(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6-06 'Dapper Drake'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 安全更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "安装更新"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "官方支持"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 移植"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 安全更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 移植"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "社区维护(Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "非自由(Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 msgid "Oficially supported"
 msgstr "官方支持"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "版权限制"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 安全更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 移植"
@@ -1427,6 +1562,18 @@ msgstr "带有非自由依赖关系的DFSG兼容软件"
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
+#~ msgid "About %li seconds remaining"
+#~ msgstr "大约还要%li秒"
+
+#~ msgid "Download is complete"
+#~ msgstr "下载完成"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "升级被取消。请报告这个bug。"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "正在升级Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "隐藏详情"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5ef6fb94..59eeff12 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-23 19:45+0000\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -75,27 +75,27 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "軟件更新"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 #, fuzzy
 msgid "(Source Code)"
 msgstr "源程式碼"
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 #, fuzzy
 msgid "Source Code"
 msgstr "源程式碼"
@@ -136,54 +136,56 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
 #, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "你選定的密碼匙無法移除，請匯報問題。 "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -191,11 +193,11 @@ msgid ""
 msgstr "你選定的密碼匙無法移除，請匯報問題。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 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 "
@@ -204,15 +206,41 @@ msgid ""
 "before proceeding."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -225,11 +253,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -238,43 +266,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
 "synaptic."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 #, fuzzy
 msgid "Error during update"
 msgstr "移除密碼匙時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -283,35 +311,38 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -320,221 +351,244 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 #, fuzzy
 msgid "Checking package manager"
 msgstr "另一個套件管理員正在執行中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 #, fuzzy
 msgid "Upgrading"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
-msgid "About %li minutes remaining"
+msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
 msgstr ""
 
-#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
+msgid "Fetching file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li at %s/s"
+msgid "About %s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "Fetching file %li of %li"
 msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 #, fuzzy
 msgid "Applying changes"
 msgstr "正在下載更改紀錄..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-#, fuzzy
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "你選定的密碼匙無法移除，請匯報問題。"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, 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:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, 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:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, 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:466
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
 #, python-format
-msgid "You have to download a total of %s."
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -582,7 +636,7 @@ msgid "Difference between the files"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+msgid "Fetching and installing the upgrades"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -602,27 +656,23 @@ 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
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 #, fuzzy
 msgid "_Replace"
 msgstr "重新載入"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr ""
 
@@ -643,67 +693,67 @@ msgid "Please check your internet connection."
 msgstr ""
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 #, fuzzy
 msgid "Downloading the upgrade tool"
 msgstr "正在下載更改紀錄"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 #, fuzzy
 msgid "Authentication failed"
 msgstr "認證"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -719,103 +769,172 @@ msgstr ""
 msgid "Downloading file %li of %li with unknown speed"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Ubuntu 已推出新版本！"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 安全性更新"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+msgid "Updates of Ubuntu"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "正在安裝軟件更新..."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Cannot install all available updates"
 msgstr "正在檢查更新套件..."
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "正在下載更改紀錄"
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "系統已經在最新狀態！"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:665
+#: ../UpdateManager/UpdateManager.py:831
 #, python-format
-msgid "New version: %s   (Size: %s)"
+msgid "From version %s to %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "版本 %s: \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "已經不再支援你用的發行版本"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -924,12 +1043,13 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>線上更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 #, fuzzy
-msgid "<b>Internet updates</b>"
+msgid "<b>Internet</b>"
 msgstr "<b>線上更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1167,181 +1287,187 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 更新"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "非自由軟件 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "非自由軟件 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "正在安裝軟件更新..."
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 #, fuzzy
 msgid "Officially supported"
 msgstr "官方支援"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟件 (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "官方支援"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "版權受限"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 更新"
@@ -1396,6 +1522,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "你選定的密碼匙無法移除，請匯報問題。"
+
+#, fuzzy
 #~ msgid "Hide details"
 #~ msgstr "<b>細節</b>"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b048f48e..5e3888d3 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-08-01 00:06+0200\n"
+"POT-Creation-Date: 2006-08-30 11:31+0200\n"
 "PO-Revision-Date: 2006-05-31 12:00+0000\n"
 "Last-Translator: PCMan <pcman.tw@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n"
@@ -65,7 +65,7 @@ msgstr ""
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:298
-#: ../SoftwareProperties/SoftwareProperties.py:315
+#: ../SoftwareProperties/SoftwareProperties.py:316
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -74,26 +74,26 @@ msgstr ""
 msgid "Nearest server"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:322
+#: ../SoftwareProperties/SoftwareProperties.py:323
 msgid "Custom servers"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:543
-#: ../SoftwareProperties/SoftwareProperties.py:560
+#: ../SoftwareProperties/SoftwareProperties.py:544
+#: ../SoftwareProperties/SoftwareProperties.py:561
 #, fuzzy
 msgid "Software Channel"
 msgstr "軟體更新"
 
-#: ../SoftwareProperties/SoftwareProperties.py:551
-#: ../SoftwareProperties/SoftwareProperties.py:568
+#: ../SoftwareProperties/SoftwareProperties.py:552
+#: ../SoftwareProperties/SoftwareProperties.py:569
 msgid "Active"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:652
+#: ../SoftwareProperties/SoftwareProperties.py:653
 msgid "(Source Code)"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:658
+#: ../SoftwareProperties/SoftwareProperties.py:659
 msgid "Source Code"
 msgstr ""
 
@@ -136,11 +136,11 @@ msgstr "請輸入光碟的名稱"
 msgid "Please insert a disc in the drive:"
 msgstr "請將光碟放入光碟機："
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:93
 msgid "Broken packages"
 msgstr "不完整套件"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:94
 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."
@@ -148,31 +148,34 @@ msgstr ""
 "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 "
 "synaptic 或 apt-get 來修恢它們。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:151
 msgid "Can't upgrade required meta-packages"
 msgstr "無法升級須要的元套件 (meta-package)"
 
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:158
 msgid "A essential package would have to be removed"
 msgstr "將會移除的核心套件"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:160
+#: ../DistUpgrade/DistUpgradeCache.py:161
 msgid "Could not calculate the upgrade"
 msgstr "無法計算升級"
 
-#: ../DistUpgrade/DistUpgradeCache.py:161
+#: ../DistUpgrade/DistUpgradeCache.py:162
+#, fuzzy
 msgid ""
-"A unresolvable problem occured while calculating the upgrade. Please report "
-"this as a bug. "
+"A unresolvable problem occured while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "計算升級時發生無法解決的問題，請匯報問題。 "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
 msgid "Error authenticating some packages"
 msgstr "認證一些套件時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeCache.py:185
+#: ../DistUpgrade/DistUpgradeCache.py:188
 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 "
@@ -181,23 +184,23 @@ msgstr ""
 "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證"
 "的套件。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:251
 #, python-format
 msgid "Can't install '%s'"
 msgstr "無法安裝‘%s’"
 
-#: ../DistUpgrade/DistUpgradeCache.py:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "無法安裝須要的套件，請匯報問題。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:256
+#: ../DistUpgrade/DistUpgradeCache.py:259
 msgid "Can't guess meta-package"
 msgstr "無法估計元套件 (meta-package)"
 
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
 "desktop package and it was not possible to detect which version of ubuntu "
@@ -209,15 +212,42 @@ msgstr ""
 "此無法偵測正在執行那個版本的 ubuntu。\n"
 " 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:48
+#: ../DistUpgrade/DistUpgradeControler.py:73
+#, fuzzy
+msgid "Failed to add the CD"
+msgstr "下載失敗"
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+#, python-format
+msgid ""
+"There was a error adding the CD, the upgrade will abort. Please report this "
+"as a bug if this is a valid Ubuntu CD.\n"
+"\n"
+"The error message was:\n"
+"'%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:94
 msgid "Reading cache"
 msgstr "正在讀取快取"
 
-#: ../DistUpgrade/DistUpgradeControler.py:149
+#: ../DistUpgrade/DistUpgradeControler.py:131
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:132
+msgid ""
+"The upgrade can use the network to check the latest updates and to fetch "
+"packages that are not on the current CD.\n"
+"If you have fast or inexpensive network access you should answer 'Yes' here. "
+"If networking is expensive for you choose 'No'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:223
 msgid "No valid mirror found"
 msgstr "找不到有效的 mirror"
 
-#: ../DistUpgrade/DistUpgradeControler.py:150
+#: ../DistUpgrade/DistUpgradeControler.py:224
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -236,11 +266,11 @@ msgstr ""
 "如果選擇「否」，則更新會被取消。"
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:167
+#: ../DistUpgrade/DistUpgradeControler.py:241
 msgid "Generate default sources?"
 msgstr "產生預設的來源？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:168
+#: ../DistUpgrade/DistUpgradeControler.py:242
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -252,21 +282,21 @@ msgstr ""
 "\n"
 "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:202
+#: ../DistUpgrade/DistUpgradeControler.py:276
 msgid "Repository information invalid"
 msgstr "無效的套件庫資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:203
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "升級套件庫時導致無效的檔案。請匯報問題。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:209
+#: ../DistUpgrade/DistUpgradeControler.py:283
 msgid "Third party sources disabled"
 msgstr "停用第三方來源"
 
-#: ../DistUpgrade/DistUpgradeControler.py:210
+#: ../DistUpgrade/DistUpgradeControler.py:284
 msgid ""
 "Some third party entries in your souces.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or with "
@@ -275,21 +305,21 @@ msgstr ""
 "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-"
 "properties' 工具或 synaptic升級後，你可以重新啟用它。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:256
+#: ../DistUpgrade/DistUpgradeControler.py:333
 msgid "Error during update"
 msgstr "更新時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:257
+#: ../DistUpgrade/DistUpgradeControler.py:334
 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:266
+#: ../DistUpgrade/DistUpgradeControler.py:343
 msgid "Not enough free disk space"
 msgstr "磁碟空間不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:267
+#: ../DistUpgrade/DistUpgradeControler.py:344
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -300,37 +330,41 @@ msgstr ""
 "clean'來移除先前安裝套件時的暫存檔。"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:326
+#: ../DistUpgrade/DistUpgradeControler.py:403
 msgid "Do you want to start the upgrade?"
 msgstr "是否要開始升級？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:343
+#: ../DistUpgrade/DistUpgradeControler.py:420
 msgid "Could not install the upgrades"
 msgstr "無法安裝升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:344
+#: ../DistUpgrade/DistUpgradeControler.py:421
+#, fuzzy
 msgid ""
-"The upgrade aborts now. Your system can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"The upgrade aborts now. Your system could be in an unusable state. A "
+"recovery was run (dpkg --configure -a).\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --"
 "configure -a)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:439
 msgid "Could not download the upgrades"
 msgstr "無法下載升級套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:360
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "升級現正中止。請檢查網路連線是否正常及再試 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:395
+#: ../DistUpgrade/DistUpgradeControler.py:476
 msgid "Some software no longer officially supported"
 msgstr "有些軟體不再有官方支援"
 
-#: ../DistUpgrade/DistUpgradeControler.py:397
+#: ../DistUpgrade/DistUpgradeControler.py:478
 msgid ""
 "These installed packages are no longer officially supported, and are now "
 "only community-supported ('universe').\n"
@@ -339,130 +373,121 @@ msgid ""
 "removal in the next step. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:422
+#: ../DistUpgrade/DistUpgradeControler.py:512
 msgid "Remove obsolete packages?"
 msgstr "移除不再使用的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Skip This Step"
 msgstr "略過這步驟(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:423
+#: ../DistUpgrade/DistUpgradeControler.py:513
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:523
 msgid "Error during commit"
 msgstr "提交時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:434
+#: ../DistUpgrade/DistUpgradeControler.py:524
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:443
+#: ../DistUpgrade/DistUpgradeControler.py:534
 msgid "Restoring original system state"
 msgstr "恢復原先的系統狀態"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:451
-#: ../DistUpgrade/DistUpgradeControler.py:475
+#: ../DistUpgrade/DistUpgradeControler.py:542
+#: ../DistUpgrade/DistUpgradeControler.py:571
 msgid "Checking package manager"
 msgstr "正在檢查套件管理程式"
 
-#: ../DistUpgrade/DistUpgradeControler.py:467
+#: ../DistUpgrade/DistUpgradeControler.py:557
 msgid "Updating repository information"
 msgstr "正在更新套件庫資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:486
+#: ../DistUpgrade/DistUpgradeControler.py:582
 msgid "Invalid package information"
 msgstr "無效的套件資訊"
 
-#: ../DistUpgrade/DistUpgradeControler.py:487
+#: ../DistUpgrade/DistUpgradeControler.py:583
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"This indicates a serious error, please report this bug against the 'update-"
+"manager' package and include the files in /var/log/dist-upgrade/ in the "
+"bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:497
+#: ../DistUpgrade/DistUpgradeControler.py:595
 msgid "Asking for confirmation"
 msgstr "詢問以確認"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:599
 msgid "Upgrading"
 msgstr "升級中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:508
+#: ../DistUpgrade/DistUpgradeControler.py:606
 msgid "Searching for obsolete software"
 msgstr "尋搜不再使用的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:513
+#: ../DistUpgrade/DistUpgradeControler.py:611
 msgid "System upgrade is complete."
 msgstr "系統升級完成。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:52
-#, python-format
-msgid "About %li days %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:56
-#, python-format
-msgid "About %li hours %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:59
-#, python-format
-msgid "About %li minutes remaining"
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:60
-#, python-format
-msgid "About %li seconds remaining"
-msgstr ""
-
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:93
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "請將‘%s’放入光碟機‘%s’中"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:111
-msgid "Download is complete"
-msgstr "下載完成"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+#, fuzzy
+msgid "Fetching is complete"
+msgstr "更新完成"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:122
-#, python-format
-msgid "Downloading file %li of %li at %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, fuzzy, python-format
+msgid "Fetching file %li of %li at %s/s"
 msgstr "正在下載檔案 %li/%li，速度在 %s/秒"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:125
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:252
 #, python-format
-msgid "Downloading file %li of %li"
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, fuzzy, python-format
+msgid "Fetching file %li of %li"
 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:156
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
 msgstr "正在套用變更"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:180
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
 msgstr "無法安裝‘%s’"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:181
-msgid "The upgrade aborts now. Please report this bug."
-msgstr "升級現正中止，請匯報問題。"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+msgid ""
+"The upgrade aborts now. Please report this bug against the 'update-manager' "
+"package and include the files in /var/log/dist-upgrade/ in the bugreport."
+msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:194
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -471,18 +496,20 @@ msgstr ""
 "取代設定檔\n"
 "‘%s‘？"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:211
+#: ../DistUpgrade/DistUpgradeViewGtk.py:219
 msgid "The 'diff' command was not found"
 msgstr "找不到‘diff’指令"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:338
+#: ../DistUpgrade/DistUpgradeViewGtk.py:347
 msgid "A fatal error occured"
 msgstr "發生嚴重錯誤"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:348
+#, fuzzy
 msgid ""
-"Please report this as a bug and include the files /var/log/dist-upgrade.log "
-"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Please report this as a bug and include the files /var/log/dist-upgrade/main."
+"log and /var/log/dist-upgrade/apt.log in your report. The upgrade aborts "
+"now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "請將此視為 bug 來回報，並於報告中包含 /var/log/dist-upgrade.log 及 /var/log/"
@@ -491,70 +518,104 @@ msgstr ""
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:449
+#: ../DistUpgrade/DistUpgradeViewGtk.py:460
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s 個套件將會移除。"
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:454
+#: ../DistUpgrade/DistUpgradeViewGtk.py:465
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s 個新套件將會安裝。"
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:460
+#: ../DistUpgrade/DistUpgradeViewGtk.py:471
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s 個套件將會升級。"
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:466
-#, python-format
-msgid "You have to download a total of %s."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:476
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 msgstr "您總共需要下載 %s。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#, fuzzy
 msgid ""
-"The upgrade can take several hours and cannot be canceled at any time later."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
 msgstr "升級可能需要數小時及無法在稍後任何時間取消。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:473
+#: ../DistUpgrade/DistUpgradeViewGtk.py:485
 msgid "To prevent data loss close all open applications and documents."
 msgstr "避免遺失請關閉所有已開啟的程式及文件。"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:479
+#: ../DistUpgrade/DistUpgradeViewGtk.py:491
 msgid "Could not find any upgrades"
 msgstr "無法找到任何升級"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
 msgid "Your system has already been upgraded."
 msgstr "系統升級已經完成。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:507
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>移除 %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, python-format
 msgid "Install %s"
 msgstr "安裝 %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:499
+#: ../DistUpgrade/DistUpgradeViewGtk.py:511
 #, python-format
 msgid "Upgrade %s"
 msgstr "升級 %s"
 
-#: ../DistUpgrade/DistUpgradeView.py:75
+#: ../DistUpgrade/DistUpgradeView.py:25
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:30
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:36
+#, python-format
+msgid ""
+"This download will take about %s with a 56k modem and about %s with a 1Mbit "
+"DSL connection"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:94
 msgid "Reboot required"
 msgstr "須要重新開機"
 
-#: ../DistUpgrade/DistUpgradeView.py:76
+#: ../DistUpgrade/DistUpgradeView.py:95
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？"
@@ -605,7 +666,8 @@ msgid "Difference between the files"
 msgstr "檔案間的差別"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-msgid "Downloading and installing the upgrades"
+#, fuzzy
+msgid "Fetching and installing the upgrades"
 msgstr "正在下載及安裝升級"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
@@ -625,26 +687,22 @@ msgid "Terminal"
 msgstr "終端"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "Upgrading Ubuntu"
-msgstr "正在升級 Ubuntu"
-
-#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
 msgstr "保留(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Report Bug"
 msgstr "報告錯誤(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Restart Now"
 msgstr "現在重新啟動(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:21
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Resume Upgrade"
 msgstr "繼續升級(_R)"
 
@@ -665,64 +723,64 @@ msgid "Please check your internet connection."
 msgstr "請檢查您的網路連線。"
 
 #. no script file found in extracted tarbal
-#: ../UpdateManager/DistUpgradeFetcher.py:151
+#: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
 msgstr "無法執行升級工具"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:152
+#: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr "這可能是升級工具的錯誤，請匯報問題"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:173
+#: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
 msgstr "正在下載升級工具"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:175
+#: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr "升級工具會引導您整個升級過程。"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:182
+#: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
 msgstr "升級工具簽署"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:185
+#: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
 msgstr "升級工具"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:207
+#: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
 msgstr "下載失敗"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:208
+#: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr "下載升級套件失敗。可能是網路問題。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:213
+#: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
 msgstr "解壓失敗"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:214
+#: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr "升級套件解壓失敗。可能是因為跟伺服器的網路連線出現問題。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:220
+#: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "檢驗失敗"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:221
+#: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:227
+#: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:228
+#: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -738,27 +796,55 @@ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "正在下載檔案 %li/%li，下載速度不明"
 
-#: ../UpdateManager/UpdateManager.py:185
+#: ../UpdateManager/UpdateManager.py:187
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "修改紀錄不存在，請稍後再試。"
 
-#: ../UpdateManager/UpdateManager.py:191
+#: ../UpdateManager/UpdateManager.py:193
 msgid "The list of changes is not available yet. Please try again later."
 msgstr "修改紀錄不存在，請稍後再試。"
 
-#: ../UpdateManager/UpdateManager.py:196
+#: ../UpdateManager/UpdateManager.py:198
 msgid ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 msgstr "無法下載更動列表。請檢查網路連線是否正常。"
 
-#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:218
+#, fuzzy
+msgid "Important security updates of Ubuntu"
+msgstr "Ubuntu 5.10 安全性更新"
+
+#: ../UpdateManager/UpdateManager.py:220
+msgid "Recommended updates of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:222
+msgid "Proposed updates for Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:223
+msgid "Backports of Ubuntu"
+msgstr ""
+
 #: ../UpdateManager/UpdateManager.py:224
+#, fuzzy
+msgid "Updates of Ubuntu"
+msgstr "升級到最新版本的 Ubuntu"
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:232 ../UpdateManager/UpdateManager.py:245
+#, fuzzy
+msgid "Other updates"
+msgstr "安裝更新套件(_I)"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:266
 msgid "Cannot install all available updates"
 msgstr "無法安裝所有更新套件"
 
-#: ../UpdateManager/UpdateManager.py:225
+#: ../UpdateManager/UpdateManager.py:267
 msgid ""
 "Some updates require the removal of further software. Use the function "
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
@@ -767,54 +853,96 @@ msgstr ""
 "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」功能"
 "或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。"
 
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:277
 msgid "The following updates will be skipped:"
 msgstr "會略過更新以下套件："
 
-#: ../UpdateManager/UpdateManager.py:408
+#: ../UpdateManager/UpdateManager.py:470
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdateManager.py:468
+#: ../UpdateManager/UpdateManager.py:531
 msgid "Downloading the list of changes..."
 msgstr "正在下載修改紀錄..."
 
-#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501
-#: ../UpdateManager/UpdateManager.py:525
+#: ../UpdateManager/UpdateManager.py:555
+msgid "Select _None"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:560
+msgid "Select _All"
+msgstr ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/UpdateManager.py:600
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/UpdateManager.py:603
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/UpdateManager.py:606
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/UpdateManager.py:609
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:617 ../UpdateManager/UpdateManager.py:627
+#: ../UpdateManager/UpdateManager.py:651
 #, python-format
 msgid "Download size: %s"
 msgstr "下載大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:510
+#: ../UpdateManager/UpdateManager.py:636
 msgid "Your system is up-to-date"
 msgstr "系統已經在最新狀態"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "您可以安裝 %s 個更新"
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:555
+#: ../UpdateManager/UpdateManager.py:680
 msgid "Please wait, this can take some time."
 msgstr "請稍候，這可能需要一點時間。"
 
-#: ../UpdateManager/UpdateManager.py:557
+#: ../UpdateManager/UpdateManager.py:682
 msgid "Update is complete"
 msgstr "更新完成"
 
-#: ../UpdateManager/UpdateManager.py:665
-#, python-format
-msgid "New version: %s   (Size: %s)"
+#: ../UpdateManager/UpdateManager.py:831
+#, fuzzy, python-format
+msgid "From version %s to %s"
 msgstr "新版本：%s   （大小：%s）"
 
-#: ../UpdateManager/UpdateManager.py:679
+#: ../UpdateManager/UpdateManager.py:835
+#, fuzzy, python-format
+msgid "Version %s"
+msgstr "版本 %s： \n"
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:837
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:851
 msgid "Your distribution is not supported anymore"
 msgstr "您正使用的發行版本已不再支援"
 
-#: ../UpdateManager/UpdateManager.py:680
+#: ../UpdateManager/UpdateManager.py:852
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
@@ -823,17 +951,17 @@ msgstr ""
 "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 "
 "http://www.ubuntu.com以取得更多升級資訊。"
 
-#: ../UpdateManager/UpdateManager.py:716
+#: ../UpdateManager/UpdateManager.py:871
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>有新的 distribution 發行版 '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:751
+#: ../UpdateManager/UpdateManager.py:906
 msgid "Software index is broken"
 msgstr "軟體索引損壞"
 
-#: ../UpdateManager/UpdateManager.py:752
+#: ../UpdateManager/UpdateManager.py:907
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -949,11 +1077,12 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-msgid "<b>Downloadable software</b>"
-msgstr ""
+msgid "<b>Internet updates</b>"
+msgstr "<b>線上更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-msgid "<b>Internet updates</b>"
+#, fuzzy
+msgid "<b>Internet</b>"
 msgstr "<b>線上更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
@@ -1192,178 +1321,184 @@ msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:62
+#: ../data/channels/Ubuntu.info.in:69
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:66
+#: ../data/channels/Ubuntu.info.in:73
 msgid ""
 "OpenSource software that is officially supported by Canonical Ltd. (main)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:69
+#: ../data/channels/Ubuntu.info.in:76
 #, fuzzy
 msgid "Community maintained (universe)"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:70
+#: ../data/channels/Ubuntu.info.in:77
 msgid "OpenSource software that is maintained by the community (universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:73
+#: ../data/channels/Ubuntu.info.in:80
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "非自由軟體 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:74
+#: ../data/channels/Ubuntu.info.in:81
 msgid "Proprietary drivers for devices (restricted) "
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:77
+#: ../data/channels/Ubuntu.info.in:84
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "非自由軟體 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:85
 msgid "Software that is restricted by copyright or legal issues (multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:90
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:97
+#: ../data/channels/Ubuntu.info.in:104
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:104
+#: ../data/channels/Ubuntu.info.in:111
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:111
+#: ../data/channels/Ubuntu.info.in:118
+#, fuzzy
+msgid "Proposed updates"
+msgstr "安裝更新套件(_I)"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:125
 msgid "Backported updates"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:117
+#: ../data/channels/Ubuntu.info.in:131
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 ‘Breezy Badger’"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51
+#: ../data/channels/Ubuntu.info.in:134 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
 msgstr "官方支援"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 ‘Breezy Badger’"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:148
+#: ../data/channels/Ubuntu.info.in:162
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:155
+#: ../data/channels/Ubuntu.info.in:169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:162
+#: ../data/channels/Ubuntu.info.in:176
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 回移套件"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:168
+#: ../data/channels/Ubuntu.info.in:182
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.10 ‘Breezy Badger’"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:185
+#: ../data/channels/Ubuntu.info.in:199
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:199
+#: ../data/channels/Ubuntu.info.in:213
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:206
+#: ../data/channels/Ubuntu.info.in:220
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:213
+#: ../data/channels/Ubuntu.info.in:227
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 回移套件"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:219
+#: ../data/channels/Ubuntu.info.in:233
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 ‘Breezy Badger’"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:228
+#: ../data/channels/Ubuntu.info.in:242
 msgid "Community maintained (Universe)"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:245
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟體 (Multiverse)"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:236
+#: ../data/channels/Ubuntu.info.in:250
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:240
+#: ../data/channels/Ubuntu.info.in:254
 #, fuzzy
 msgid "Oficially supported"
 msgstr "官方支援"
 
 #. CompDescription
-#: ../data/channels/Ubuntu.info.in:243
+#: ../data/channels/Ubuntu.info.in:257
 msgid "Restricted copyright"
 msgstr "版權受限制"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:250
+#: ../data/channels/Ubuntu.info.in:264
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 5.10 安全性更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:257
+#: ../data/channels/Ubuntu.info.in:271
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/channels/Ubuntu.info.in:264
+#: ../data/channels/Ubuntu.info.in:278
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 回移套件"
@@ -1414,6 +1549,15 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體"
 msgid "Non-DFSG-compatible Software"
 msgstr "不符合 DFSG 的軟體"
 
+#~ msgid "Download is complete"
+#~ msgstr "下載完成"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "升級現正中止，請匯報問題。"
+
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "正在升級 Ubuntu"
+
 #~ msgid "Hide details"
 #~ msgstr "隱藏詳細資料"
 
diff --git a/setup.py b/setup.py
index 7ea56440..553be74e 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,8 @@ setup(name='update-manager',
       packages=[
                 'SoftwareProperties',
                 'UpdateManager',
-                'UpdateManager.Common'
+                'UpdateManager.Common',
+                'DistUpgrade'
                 ],
       scripts=[
                'software-properties',