* DistUpgrade/build-tarball.sh:

  - create a tarbal for the dist-upgrade tool
  - include the current set of translations
* DistUpgrade/DistUpgradeViewGtk.py: 
  - look for i18n files in "mo/"
* po/POTFILES.in:
  - include the dist-upgrade stuff as well
* po/*.po: make update-po

21 files changed, 6473 insertions, 1296 deletions

diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index 7629ed64..c7cb89f3 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -122,6 +122,7 @@ class MyCache(apt.Cache):
             if not trusted:
                 untrusted.append(pkg.name)
         if len(untrusted) > 0:
+            untrusted.sort()
             logging.error("Unauthenticated packages found: '%s'" % \
                           " ".join(untrusted))
             # FIXME: maybe ask a question here? instead of failing?
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 0cbc22be..ee05a5bf 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -35,7 +35,7 @@ import os
 
 from apt.progress import InstallProgress
 from DistUpgradeView import DistUpgradeView
-from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp
+from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp, bindtextdomain
 
 from gettext import gettext as _
 
@@ -182,6 +182,8 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp):
     
     def __init__(self):
         # FIXME: i18n must be somewhere relative do this dir
+        bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo"))
+
         SimpleGladeApp.__init__(self, "DistUpgrade.glade",
                                 None, domain="update-manager")
         self.window_main.set_keep_above(True)
diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh
new file mode 100755
index 00000000..57185c34
--- /dev/null
+++ b/DistUpgrade/build-tarball.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+DIST=dapper
+
+# cleanup
+rm -f *~ *.bak *.pyc
+
+# update po
+(cd ../po; make update-po)
+
+# copy the mo files
+cp -r ../po/mo .
+
+# make symlink
+if [ ! -h $DIST ]; then
+	ln -s dist-upgrade.py $DIST
+fi
+
+# create the tarbal 
+tar -c -z -v --exclude=$DIST.tar.gz --exclude=$0 -f $DIST.tar.gz .
+
+
diff --git a/po/Makefile b/po/Makefile
index 801a9e20..667f574d 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -19,8 +19,4 @@ merge-po: $(PO_FILES)
 
 # dummy target 
 update-po: $(DOMAIN).pot merge-po $(patsubst %.po,%.mo,$(wildcard *.po))
-	# update the po files 
-	#for f in $(PO_FILES); do \
-	#	intltool-update -r $${f%.po}  -g $(DOMAIN); \
-	#done
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 459c6309..d4239f45 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,3 +6,9 @@ data/UpdateManager.glade
 [type: gettext/rfc822deb] channels/Debian.info.in
 [type: python] src/update-manager
 SoftwareProperties/SoftwareProperties.py
+DistUpgrade/DistUpgradeCache.py
+DistUpgrade/DistUpgradeControler.py
+DistUpgrade/DistUpgradeViewGtk.py
+DistUpgrade/DistUpgradeView.py
+DistUpgrade/dist-upgrade.py
+DistUpgrade/DistUpgrade.glade
\ No newline at end of file
diff --git a/po/da.po b/po/da.po
index bfc6a8fd..1d572fd3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-28 11:31+0200\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-opdateringer</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -41,47 +42,50 @@ msgid "Authentication"
 msgstr "_Godkendelse"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Kontrollér om der er nye opdateringer automatisk."
 
 #: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Fjern den markerede nøgle fra den troværdige nøglering."
+
+#: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Genopret de forvalgte nøgler"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Indstillinger"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Detaljer</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Pakker der skal installeres:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Tilgængelige opdateringer</b></big>\n"
-"\n"
-"Følgende pakker kan opgraderes. Du kan opgradere dem ved at bruge "
-"installations-knappen."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -91,53 +95,61 @@ msgstr ""
 "\n"
 "Skal hente ændringerne fra den centrale server"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Afbryd overførsel af ændringsloggen"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Ændringer"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Genindlæs"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Opdateringer"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Opgradering færdig"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Installér"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Genindlæs"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -246,27 +258,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -274,14 +286,330 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Opgradering færdig"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Opgradering færdig"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Arkiver er ændret</span>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Detaljer</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Pakker der skal installeres:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Tilgængelige opdateringer</b></big>\n"
+#~ "\n"
+#~ "Følgende pakker kan opgraderes. Du kan opgradere dem ved at bruge "
+#~ "installations-knappen."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Kommentar:</b>"
 
@@ -350,9 +678,6 @@ msgstr ""
 #~ "Føj en ny nøgle til den troværdige nøglering. Kontrollér at du har "
 #~ "modtaget nøglen via en sikker kanal og at du stoler på ejeren."
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Kontrollér om der er nye opdateringer automatisk."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Ryd automatisk _midlertidige pakke-filer"
 
@@ -378,9 +703,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Maksimal størrelse i MB:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Fjern den markerede nøgle fra den troværdige nøglering."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
@@ -581,18 +903,12 @@ msgstr ""
 #~ msgid "Your system is up-to-date"
 #~ msgstr "Dit system er opdateret"
 
-#~ msgid "<span weight=\"bold\" size=\"larger\">Repositories changed</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Arkiver er ændret</span>"
-
 #~ msgid "Non-free"
 #~ msgstr "Ikke frit"
 
 #~ msgid "0"
 #~ msgstr "0"
 
-#~ msgid "    "
-#~ msgstr "    "
-
 #~ msgid "Community maintained (UNSUPPORTED from canonical)"
 #~ msgstr "Vedligeholdt af fællesskabet (understøttes IKKE af Canonical)"
 
diff --git a/po/de.po b/po/de.po
index 289d5343..ddcdb334 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: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-04-02 08:46+0200\n"
 "Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
@@ -18,7 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-Aktualisierungen</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -42,48 +43,52 @@ msgid "Authentication"
 msgstr "A_uthentifizierung"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Automatische Über_prüfung auf Software-Aktualisierungen"
 
 #: ../data/SoftwareProperties.glade.h:7
 #, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+"Den gewählten Schlüssel aus dem vertrauenswürdigen Schlüsselbund entfernen."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
 msgid "Installation Media"
 msgstr "Aktualisierungen werden installiert..."
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Vorgabeschlüssel wiederherstellen"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Software-Einstellungen"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Details</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Zu installierende Pakete:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Verfügbare Aktualisierungen</b></big>\n"
-"\n"
-"Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann "
-"durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -94,54 +99,62 @@ msgstr ""
 "\n"
 "Die Änderungen müssen vom zentralen Server abgerufen werden"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Herunterladen des Änderungsprotokolls abbrechen"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Änderungen"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-# »Aktualisieren« könnte hier verwirrend sein -fa-
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Neu laden"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Software-Aktualisierungen"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Aktualisierung fertiggestellt"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Installieren"
 
+# »Aktualisieren« könnte hier verwirrend sein -fa-
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Neu laden"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -249,31 +262,31 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Eine Schlüsseldatei wählen"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Fehler beim Importieren der gewählten Datei"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist "
 "beschädigt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Fehler beim Entfernen des Schlüssels"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
 "hierfür einen Fehlerbericht."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -281,14 +294,337 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
+"hierfür einen Fehlerbericht."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
+"hierfür einen Fehlerbericht."
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Fehler beim Entfernen des Schlüssels"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Aktualisierung fertiggestellt"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Aktualisierung fertiggestellt"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr "Ubuntu wird aktualisiert"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Details</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Zu installierende Pakete:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Verfügbare Aktualisierungen</b></big>\n"
+#~ "\n"
+#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung "
+#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen "
+#~ "werden."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Kommentar:</b>"
 
@@ -359,9 +695,6 @@ msgstr ""
 #~ "Schlüsselbund. Stellen Sie sicher, dass der Schlüssel über eine sichere "
 #~ "Verbindung bezogen wurde und dass der Besitzer vertrauenswürdig ist."
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Automatische Über_prüfung auf Software-Aktualisierungen"
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "_Temporäre Paketdateien automatisch löschen"
 
@@ -387,11 +720,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Maximale Größe in MB:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr ""
-#~ "Den gewählten Schlüssel aus dem vertrauenswürdigen Schlüsselbund "
-#~ "entfernen."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
diff --git a/po/el.po b/po/el.po
index 990d4d9b..eb4cf06d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-05 14:33+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -40,95 +41,104 @@ msgid "Authentication"
 msgstr "Πι_στοποίηση"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
+msgid "Automatically check for updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:7
-msgid "Installation Media"
+msgid "Import the public key from a trusted software provider"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:8
-msgid "Restore Defaults"
+msgid "Installation Media"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:9
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 #, fuzzy
 msgid "Software Preferences"
 msgstr "<b>Πηγές λογισμικού</b>"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-#, fuzzy
-msgid "<b>Details</b>"
-msgstr "<b>Ενότητες:</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-#, fuzzy
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Ενότητες:</b>"
+msgid "<big><b>Reading package information</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:3
 msgid ""
-"<big><b>Available Updates</b></big>\n"
+"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+"Need to get the changes from the central server"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:6
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
+msgid "Cancel downloading of the changelog"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Description"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:10
-msgid "Changes"
+msgid "Release Notes"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:11
-msgid "Description"
+msgid "Show details"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+msgid "Show progress of single files"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:13
-msgid "Reload"
+msgid "Software Updates"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:14
 msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
-msgid "Show progress of single files"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:18
-msgid "Software Updates"
+#: ../data/UpdateManager.glade.h:15
+msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
-msgid "Upgrade"
+#: ../data/UpdateManager.glade.h:16
+msgid "_Install"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
-msgid "_Install"
+#: ../data/UpdateManager.glade.h:17
+msgid "_Reload"
 msgstr ""
 
 #. ChangelogURI
@@ -233,27 +243,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -261,14 +271,317 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+msgid "Perform Upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Ενότητες:</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#, fuzzy
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Ενότητες:</b>"
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Σχόλιο:</b>"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index c945afad..c6fe9e1d 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-04-03 01:26-0500\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internet Updates</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -41,48 +42,51 @@ msgid "Authentication"
 msgstr "A_uthentication"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Automatically check for software _updates."
 
 #: ../data/SoftwareProperties.glade.h:7
 #, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Remove the selected key from the trusted keyring."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
 msgid "Installation Media"
 msgstr "Installing updates..."
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Restore default keys"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Software Preferences"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Details</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Packages to install:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -92,53 +96,61 @@ msgstr ""
 "\n"
 "Need to get the changes from the central server"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Cancel downloading the ChangeLog"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Changes"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Description"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Reload"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Software Updates"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Upgrade finished"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Install"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Reload"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -246,28 +258,28 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Choose a key-file"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Error importing selected file"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "The selected file may not be a GPG key file or it might be corrupt."
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Error removing the key"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -275,14 +287,334 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"The key you selected could not be removed. Please report this as a bug."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"The key you selected could not be removed. Please report this as a bug."
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Error removing the key"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Upgrade finished"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Upgrade finished"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Details</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Packages to install:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Comment:</b>"
 
@@ -351,9 +683,6 @@ msgstr ""
 #~ "Add a new key file to the trusted keyring. Make sure that you got the key "
 #~ "over a secure channel and that you trust the owner. "
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Automatically check for software _updates."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Automatically clean _temporary packages files"
 
@@ -379,9 +708,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Maximum size in MB:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Remove the selected key from the trusted keyring."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
diff --git a/po/es.po b/po/es.po
index 6dd8c371..97335902 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-04-04 15:00+0200\n"
 "Last-Translator: Jorge Bernal <koke@amedias.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
@@ -20,7 +20,8 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizaciones por Internet</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -44,48 +45,51 @@ msgid "Authentication"
 msgstr "A_utenticación"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "_Comprobar automáticamente las actualizaciones de software."
 
 #: ../data/SoftwareProperties.glade.h:7
 #, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Quitar la clave seleccionada del anillo de confianza."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
 msgid "Installation Media"
 msgstr "Instalando actualizaciones..."
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Recuperar claves predeterminadas"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Preferencias de software"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Detalles:</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Paquetes a instalar:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Actualizaciones disponibles</b></big>\n"
-"\n"
-"El gestor de actualizaciones encontró los siguientes paquetes actualizables. "
-"Puede actualizarlos usando el botón Instalar."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -95,53 +99,61 @@ msgstr ""
 "\n"
 "Se necesita descargar los cambios del servidor central"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Cancelar la descarga del informe de cambios"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Cambios"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Descripción"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Recargar"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Actualizaciones de software"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Actualización finalizada"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Instalar"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Recargar"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -249,31 +261,31 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Elija un fichero de clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Hubo un error al importar el fichero seleccionado"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté "
 "corrupto."
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Hubo un error al quitar la clave"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
 "como un fallo."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -281,14 +293,336 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
+"como un fallo."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
+"como un fallo."
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Hubo un error al quitar la clave"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Actualización finalizada"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Actualización finalizada"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Detalles:</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Paquetes a instalar:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Actualizaciones disponibles</b></big>\n"
+#~ "\n"
+#~ "El gestor de actualizaciones encontró los siguientes paquetes "
+#~ "actualizables. Puede actualizarlos usando el botón Instalar."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Comentario:</b>"
 
@@ -359,9 +693,6 @@ msgstr ""
 #~ "obtuvo la clave a través de un canal seguro y que confía en el "
 #~ "propietario. "
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "_Comprobar automáticamente las actualizaciones de software."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Limpiar _temporalmente los archivos de paquetes"
 
@@ -387,9 +718,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Tamaño máximo en MB:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Quitar la clave seleccionada del anillo de confianza."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
diff --git a/po/fi.po b/po/fi.po
index 4d0df42f..964a40be 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-30 08:30+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <LL@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-päivitykset</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -41,47 +42,50 @@ msgid "Authentication"
 msgstr "Varmenn_us"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Tarkista ohjelma_päivitykset automaattisesti."
 
 #: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Poista valittu avain luotetuista avaimista."
+
+#: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Palauta oletusavaimet"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Asetukset"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Yksityiskohdat</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Asennettavat paketit:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Saatavilla olevat päivitykset</b></big>\n"
-"\n"
-"Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
-"Asenna-painiketta."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -91,53 +95,61 @@ msgstr ""
 "\n"
 "Muutokset täytyy ladata keskuspalvelimelta"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Keskeytä muutosluettelon lataus"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Muutokset"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Päivitä"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Ohjelmapäivitykset"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Päivitykset suoritettu"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Asenna"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Päivitä"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -245,28 +257,28 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Valitse avaintiedosto"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Virhe tuotaessa valittua avainta"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto"
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Virhe poistettaessa avainta"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -274,14 +286,334 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus."
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Virhe poistettaessa avainta"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Päivitykset suoritettu"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Päivitykset suoritettu"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Yksityiskohdat</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Asennettavat paketit:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Saatavilla olevat päivitykset</b></big>\n"
+#~ "\n"
+#~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
+#~ "Asenna-painiketta."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Kommentti:</b>"
 
@@ -350,9 +682,6 @@ msgstr ""
 #~ "vastaanotit avaimen luotettua kanavaa pitkin ja että luotat avaimen "
 #~ "omistajaan. "
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Tarkista ohjelma_päivitykset automaattisesti."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Tyhjennä _väliaikaistiedostot automaattisesti"
 
@@ -378,9 +707,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Maksimikoko megatavuissa:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Poista valittu avain luotetuista avaimista."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
@@ -588,8 +914,5 @@ msgstr ""
 #~ msgid "0"
 #~ msgstr "0"
 
-#~ msgid "    "
-#~ msgstr "    "
-
 #~ msgid "Non-free"
 #~ msgstr "Ei-vapaa"
diff --git a/po/fr.po b/po/fr.po
index 6d5e7748..5e87470b 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: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-04-04 19:43+0200\n"
 "Last-Translator: \n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Mise à jour par Internet</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -41,48 +42,51 @@ msgid "Authentication"
 msgstr "A_uthentification"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Vérifier automatiquement les mises à jo_ur des logiciels."
 
 #: ../data/SoftwareProperties.glade.h:7
 #, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Supprimer la clé sélectionnée du trousseau digne de confiance."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
 msgid "Installation Media"
 msgstr "Installation des mises à jour..."
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Restaurer les clés par défaut"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Préférences du logiciel"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Détails</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Paquets à installer :</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Mises à jour disponibles</b></big>\n"
-"\n"
-"Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour "
-"en utilisant le bouton Installer."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -92,53 +96,61 @@ msgstr ""
 "\n"
 "Il est nécessaire de récupérer les changement du serveur central"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Annuler le téléchargement du changelog"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Changements"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Description"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Recharger"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Mises à jour des logiciels"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Mise à jour terminée"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Installer"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Recharger"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -246,31 +258,31 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Choisir un fichier de clé"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Erreur lors du chargement du fichier sélectionné"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Le fichier sélectionné n'est peut-être pas un clé GPG ou alors il est "
 "corrompu."
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Erreur lors de la suppression de la clé"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
 "ceci comme étant un bug."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -278,14 +290,336 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
+"ceci comme étant un bug."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer "
+"ceci comme étant un bug."
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Erreur lors de la suppression de la clé"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Mise à jour terminée"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Mise à jour terminée"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Détails</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Paquets à installer :</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Mises à jour disponibles</b></big>\n"
+#~ "\n"
+#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à "
+#~ "jour en utilisant le bouton Installer."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Commentaire :</b>"
 
@@ -356,9 +690,6 @@ msgstr ""
 #~ "vérifier que vous avez obtenu la clé à travers un canal sécurisé et que "
 #~ "vous faites confiance à son possesseur."
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Vérifier automatiquement les mises à jo_ur des logiciels."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Nettoyer automatiquement les fichiers _temporaires des paquets"
 
@@ -384,9 +715,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Taille maximale en Mo :"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Supprimer la clé sélectionnée du trousseau digne de confiance."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
@@ -603,6 +931,3 @@ msgstr ""
 
 #~ msgid "0"
 #~ msgstr "0"
-
-#~ msgid "    "
-#~ msgstr "    "
diff --git a/po/hu.po b/po/hu.po
index 887b9ae7..6136343a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-04-03 12:32+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -18,7 +18,8 @@ msgstr ""
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internetes frissítések</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -42,48 +43,51 @@ msgid "Authentication"
 msgstr "_Hitelesítés"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Szoftverfrissítések a_utomatikus keresése."
 
 #: ../data/SoftwareProperties.glade.h:7
 #, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "A kijelölt kulcs eltávolítása a megbízható kulcstartóról."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
 msgid "Installation Media"
 msgstr "Frissítések telepítése..."
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Alapértelmezett kulcsok visszaállítása"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Szoftver beállításai"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Részletek</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Telepítendő csomagok:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Elérhető frissítések</b></big>\n"
-"\n"
-"A következő csomagok frissíthetőek. A Telepítés gomb segítségével "
-"frissítheti őket."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -93,53 +97,61 @@ msgstr ""
 "\n"
 "A módosításokat le kell tölteni a központi kiszolgálóról "
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "A módosítások listájának letöltésének megszakítása"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Módosítások"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Leírás"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Újratöltés"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Szoftverfrissítések"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "A frissítés befejeződött"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Telepítés"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Újratöltés"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -247,28 +259,28 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Válasszon egy kulcsfájlt"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Hiba a kiválasztott fájl importálása közben"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült."
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Hiba a kulcs eltávolítása közben"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -276,14 +288,334 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Hiba a kulcs eltávolítása közben"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "A frissítés befejeződött"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "A frissítés befejeződött"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Részletek</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Telepítendő csomagok:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Elérhető frissítések</b></big>\n"
+#~ "\n"
+#~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével "
+#~ "frissítheti őket."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Megjegyzés:</b>"
 
@@ -353,9 +685,6 @@ msgstr ""
 #~ "kulcsot biztonságos csatornán keresztül kapta és megbízik a "
 #~ "tulajdonosban. "
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Szoftverfrissítések a_utomatikus keresése."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Átmeneti csomagfájlok automatikus _törlése"
 
@@ -381,9 +710,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Legnagyobb méret Mb-ban:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "A kijelölt kulcs eltávolítása a megbízható kulcstartóról."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
diff --git a/po/ja.po b/po/ja.po
index e616818c..2e9c9999 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-12 18:04+0900\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-10-12 17:28+0900\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\n"
@@ -17,214 +17,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/gnome-software-properties.glade.h:1
-msgid "<b>Comment:</b>"
-msgstr "<b>コメント:</b>"
-
-#: ../data/gnome-software-properties.glade.h:2
-msgid "<b>Components</b>"
-msgstr "<b>コンポーネント</b>"
-
-#: ../data/gnome-software-properties.glade.h:3
-msgid "<b>Distribution:</b>"
-msgstr "<b>ディストリビューション:</b>"
-
-#: ../data/gnome-software-properties.glade.h:4
-msgid "<b>Internet Updates</b>"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>インターネットアップデート</b>"
 
-#: ../data/gnome-software-properties.glade.h:5
-msgid "<b>Repository</b>"
-msgstr "<b>リポジトリ</b>"
-
-#: ../data/gnome-software-properties.glade.h:6
-msgid "<b>Sections:</b>"
-msgstr "<b>セクション:</b>"
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>詳細</b>"
 
-#: ../data/gnome-software-properties.glade.h:7
-msgid "<b>Software Sources</b>"
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Sources</b>"
 msgstr "<b>ソフトウェア取得元</b>"
 
-#: ../data/gnome-software-properties.glade.h:8
-msgid "<b>Temporary files</b>"
-msgstr "<b>一時ファイル</b>"
-
-#: ../data/gnome-software-properties.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>タイプ:</b>"
-
-#: ../data/gnome-software-properties.glade.h:10
-msgid "<b>URI:</b>"
-msgstr "<b>URI:</b>"
-
-#: ../data/gnome-software-properties.glade.h:11
-msgid "<b>User Interface</b>"
-msgstr "ユーザインターフェース"
-
-#: ../data/gnome-software-properties.glade.h:12
-msgid ""
-"<big><b>Authentication keys</b></big>\n"
-"\n"
-"You can add and remove authentication keys in this dialog. A key makes it "
-"possible to verify the integrity of the software you download."
-msgstr ""
-"<big><b>認証鍵</b></big>\n"
-"\n"
-"認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完全"
-"なものか確認することができます。"
-
-#: ../data/gnome-software-properties.glade.h:15
-msgid ""
-"<big><b>Enter the complete APT line of the repository that you want to add</"
-"b></big>\n"
-"\n"
-"The APT line contains the type, location and content of a repository, for "
-"example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-"detailed description of the syntax in the documentation."
-msgstr ""
-"<big><b>追加したい APT line のレポジトリを入力してください。</b></big>\n"
-"\n"
-"APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb http://"
-"ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式について書か"
-"れています。"
-
-#: ../data/gnome-software-properties.glade.h:18
-msgid "APT line:"
-msgstr "APT line:"
-
-#: ../data/gnome-software-properties.glade.h:19
-msgid "A_uthentication"
-msgstr "認証(_U)"
-
-#: ../data/gnome-software-properties.glade.h:20
-msgid "Add _CD"
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
 msgstr "CDの追加(_C)"
 
-#: ../data/gnome-software-properties.glade.h:21
-msgid ""
-"Add a new key file to the trusted keyring. Make sure that you received the "
-"key over a secure channel and that you trust the owner. "
-msgstr ""
-"新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経"
-"由で鍵を取得し、信頼される持ち主のものか確認してください。"
-
-#: ../data/gnome-software-properties.glade.h:22
+#: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
 msgstr "認証"
 
-#: ../data/gnome-software-properties.glade.h:23
-msgid "Automatically check for software _updates."
+#: ../data/SoftwareProperties.glade.h:6
+#, fuzzy
+msgid "Automatically check for updates"
 msgstr "アップデートを自動的にチェックする(_U)"
 
-#: ../data/gnome-software-properties.glade.h:24
-msgid "Automatically clean _temporary packages files"
-msgstr "一時ファイルを自動的に削除する(_T)"
-
-#: ../data/gnome-software-properties.glade.h:25
-msgid ""
-"Binary\n"
-"Source"
-msgstr ""
-"バイナリ\n"
-"ソース"
-
-#: ../data/gnome-software-properties.glade.h:27
-msgid "Clean interval in days: "
-msgstr "削除する間隔(日): "
-
-#: ../data/gnome-software-properties.glade.h:28
-msgid "Delete _old packages in the package cache"
-msgstr "パッケージキャッシュにある古いパッケージを削除する(_O)"
-
-#: ../data/gnome-software-properties.glade.h:29
-msgid "Edit Repository..."
-msgstr "リポジトリの編集..."
-
-#: ../data/gnome-software-properties.glade.h:30
-msgid "Maximum age in days:"
-msgstr "最長の保存期間(日):"
-
-#: ../data/gnome-software-properties.glade.h:31
-msgid "Maximum size in MB:"
-msgstr "最大量(MB):"
-
-#: ../data/gnome-software-properties.glade.h:32
-msgid "Remove the selected key from the trusted keyring."
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
 msgstr "信頼されたキーリングから選択した鍵を削除します。"
 
-#: ../data/gnome-software-properties.glade.h:33
-msgid "Restore default keys"
-msgstr "デフォルトの鍵を元に戻す"
-
-#: ../data/gnome-software-properties.glade.h:34
-msgid ""
-"Restore the default keys shipped with the distribution. This will not change "
-"user installed keys."
-msgstr ""
-"ディストリビューション付属のデフォルトの鍵を元に戻します。この変更によりユー"
-"ザが追加した鍵が失われることはありません。"
-
-#: ../data/gnome-software-properties.glade.h:35
-msgid "Set _maximum size for the package cache"
-msgstr "パッケージキャッシュの最大量を設定する(_M)"
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "アップデートをインストール中..."
 
-#: ../data/gnome-software-properties.glade.h:36
-msgid "Settings"
-msgstr "設定"
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "デフォルトの鍵を元に戻す"
 
-#: ../data/gnome-software-properties.glade.h:37
-msgid "Show disabled software sources"
-msgstr "無効なソフトウェア取得元を表示"
+#: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "デフォルトの鍵を元に戻す"
 
-#: ../data/gnome-software-properties.glade.h:38
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "ソフトウェアの設定"
 
-#: ../data/gnome-software-properties.glade.h:39
-msgid "Update interval in days: "
-msgstr "アップデートする間隔(日): "
-
-#: ../data/gnome-software-properties.glade.h:40
-msgid "_Add Repository"
-msgstr "リポジトリの追加(_A)"
-
-#: ../data/gnome-software-properties.glade.h:41
-msgid "_Custom"
-msgstr "カスタム(_C)"
-
-#: ../data/gnome-software-properties.glade.h:42
-msgid "_Download upgradable packages"
-msgstr "アップグレード可能なパッケージを取得する(_D)"
-
-#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "アップデート可能なファイルの表示とインストール"
-
-#: ../data/update-manager.desktop.in.h:2
-msgid "Update Manager"
-msgstr "アップデートマネージャ"
-
-#: ../data/update-manager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>詳細</b>"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
+msgstr ""
 
-#: ../data/update-manager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>インストールするパッケージ:</b>"
+#: ../data/UpdateManager.glade.h:1
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
-#: ../data/update-manager.glade.h:3 ../src/update-manager.in:669
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+#: ../data/UpdateManager.glade.h:2
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>アップデートがあります</b></big>\n"
-"\n"
-"以下のパッケージがアップグレード可能です。インストールボタンを押すとこれらの"
-"パッケージがインストールされます。"
 
-#: ../data/update-manager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -234,304 +97,812 @@ msgstr ""
 "\n"
 "中央サーバから変更点を取得する必要があります"
 
-#: ../data/update-manager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "変更点の取得を中止"
 
-#: ../data/update-manager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "変更点"
 
-#: ../data/update-manager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "詳細"
 
-#: ../data/update-manager.glade.h:12
-msgid "Reload"
-msgstr "再読込"
-
-#: ../data/update-manager.glade.h:13
+#: ../data/UpdateManager.glade.h:9
 msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
 msgstr ""
-"サーバからパッケージ情報を読み込み直します。\n"
-"\n"
-"ずっとインターネットに接続されたままなら、自動的に行います。"
-"アナログモデムなどでそうではないなら、アップデートマネージャに新しいアップデートが"
-"あるかどうかを知らせるため、このボタンを使用して手動で行う必要があります。"
 
-#: ../data/update-manager.glade.h:16
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "ソフトウェアのアップデート"
 
-#: ../data/update-manager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "インストール(_I)"
 
-#: ../src/aptsources.py.in:236 ../src/aptsources.py.in:284
-#: ../src/aptsources.py.in:359
-msgid "Officially supported"
-msgstr "公式サポート"
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "再読込"
 
-#: ../src/aptsources.py.in:237 ../src/aptsources.py.in:285
-msgid "Restricted copyright"
-msgstr "Restricted copyright"
+#. ChangelogURI
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
 
-#: ../src/aptsources.py.in:238 ../src/aptsources.py.in:286
-msgid "Community maintained (Universe)"
-msgstr "コミュニティによるメンテナンス (Universe)"
+#. Description
+#: ../channels/Ubuntu.info.in:6
+msgid "Breezy 6.04 \"Dapper Drake\""
+msgstr ""
 
-#: ../src/aptsources.py.in:239 ../src/aptsources.py.in:287
-msgid "Non-free (Multiverse)"
-msgstr "非フリー (Multiuniverse)"
+#. Description
+#: ../channels/Ubuntu.info.in:23
+msgid "Breezy 5.10 \"Breezy Badger\""
+msgstr ""
 
-#: ../src/aptsources.py.in:250 ../src/aptsources.py.in:340
-#: ../src/aptsources.py.in:353
+#. Description
+#: ../channels/Ubuntu.info.in:40
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
-#: ../src/aptsources.py.in:255 ../src/aptsources.py.in:326
+#. Description
+#: ../channels/Ubuntu.info.in:57
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
-#: ../src/aptsources.py.in:278
-msgid "Binary"
-msgstr "バイナリ"
+#. Description
+#: ../channels/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#: ../src/aptsources.py.in:279
-msgid "Source"
-msgstr "ソース"
+#. Description
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.04 Security Updates"
+msgstr "Ubuntu 5.04 セキュリティアップデート"
 
-#: ../src/aptsources.py.in:291 ../src/aptsources.py.in:296
-#: ../src/aptsources.py.in:301
-msgid "CD"
-msgstr "CD"
+#. CompDescription
+#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
+#, fuzzy
+msgid "Oficially supported"
+msgstr "公式サポート"
 
-#: ../src/aptsources.py.in:322
-msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.04 セキュリティアップデート"
+#. CompDescription
+#: ../channels/Ubuntu.info.in:97
+msgid "Restricted copyright"
+msgstr "Restricted copyright"
 
-#: ../src/aptsources.py.in:332 ../src/aptsources.py.in:345
-msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 セキュリティアップデート"
+#. CompDescription
+#: ../channels/Ubuntu.info.in:100
+msgid "Community maintained (Universe)"
+msgstr "コミュニティによるメンテナンス (Universe)"
 
-#: ../src/aptsources.py.in:336 ../src/aptsources.py.in:349
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 セキュリティアップデート"
+#. CompDescription
+#: ../channels/Ubuntu.info.in:103
+msgid "Non-free (Multiverse)"
+msgstr "非フリー (Multiuniverse)"
 
-#: ../src/aptsources.py.in:360
-msgid "Contributed software"
-msgstr "寄贈ソフトウェア"
+#. ChangelogURI
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
 
-#: ../src/aptsources.py.in:361
-msgid "Non-free software"
-msgstr "非フリーソフトウェア"
+#. Description
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
 
-#: ../src/aptsources.py.in:362
-msgid "US export restricted software"
-msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア"
+#. BaseURI
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
 
-#: ../src/aptsources.py.in:377
-msgid "Debian Stable Security Updates"
+#. Description
+#: ../channels/Debian.info.in:20
+#, fuzzy
+msgid "Debian 3.1 \"Sarge\" Security Updates"
 msgstr "Debian Stable セキュリティアップデート"
 
-#. some known keys
-#: ../src/dialog_apt_key.py.in:37
-msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#. Description
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
 
-#: ../src/dialog_apt_key.py.in:38
-msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#. Description
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
 
-#: ../src/dialog_apt_key.py.in:122
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "キーファイルを選択"
 
-#: ../src/dialog_apt_key.py.in:132
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "選択したファイルのインポートエラー"
 
-#: ../src/dialog_apt_key.py.in:133
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。"
 
-#: ../src/dialog_apt_key.py.in:145
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "キー削除のエラー"
 
-#: ../src/dialog_apt_key.py.in:146
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
 
-#: ../src/gnome-software-properties.in:72
-msgid "Repositories changed"
-msgstr "リポジトリが変更されました"
-
-#: ../src/gnome-software-properties.in:74
-#, c-format
+#: ../SoftwareProperties/SoftwareProperties.py:304
+#, python-format
 msgid ""
-"The repository information has changes. A backup copy of your sources.list "
-"is stored in %s.save. \n"
+"<big><b>Error scaning the CD</b></big>\n"
 "\n"
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:354
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:370
+msgid "Please insert a disc in the drive:"
 msgstr ""
-"リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコピー"
-"しました\n"
-"\n"
-"パッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?"
 
-#: ../src/update-manager.in:138
-msgid "Your system has broken packages!"
-msgstr "システムに壊れたパッケージがあります！"
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
 
-#: ../src/update-manager.in:139
+#: ../DistUpgrade/DistUpgradeCache.py:88
 msgid ""
-"This means that some dependencies of the installed packages are not "
-"satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
+"Your system contains broken packages that couldn't be fixed with this "
+"software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
-"インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" また"
-"は \"apt-get\" を使用して修正してください。 "
 
-#: ../src/update-manager.in:154
-msgid "It is not possible to upgrade all packages."
-msgstr "全てのパッケージをアップグレードすることは不可能です。"
+#: ../DistUpgrade/DistUpgradeCache.py:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
 
-#: ../src/update-manager.in:156
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
 msgid ""
-"This means that besides the actual upgrade of the packages some further "
-"action (such as installing or removing packages) is required. Please use "
-"Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation."
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
 msgstr ""
-"パッケージのアップグレードの他にパッケージのインストールや削除などの別の対処"
-"がいるようです。Synaptic \"Smart Upgrade\"か\"apt-get dist-upgrade\"を実行し"
-"て問題を修正してください。"
 
-#: ../src/update-manager.in:171
-msgid "The following packages are not upgraded: "
-msgstr "これらのパッケージはアップグレードされません:"
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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 ""
 
-#: ../src/update-manager.in:248
-msgid "Changes not found, the server may not be updated yet."
+#: ../DistUpgrade/DistUpgradeCache.py:193
+#, python-format
+msgid "Can't install '%s'"
 msgstr ""
-"変更点は見つかりませんでした。サーバはまだアップデートされていないようで"
-"す。"
 
-#: ../src/update-manager.in:251
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
 msgid ""
-"Failed to download changes. Please check if there is an active internet "
-"connection."
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
 msgstr ""
-"変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
-"い。"
 
-#: ../src/update-manager.in:271
-#, c-format
-msgid "Version %s: \n"
-msgstr "バージョン %s: \n"
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
 
-#: ../src/update-manager.in:319
-msgid "Downloading changes..."
-msgstr "変更点を取得中..."
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
 
-#: ../src/update-manager.in:375
-msgid "The updates are being applied."
-msgstr "アップデートされました。"
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
 
-#: ../src/update-manager.in:377
-msgid "Upgrade finished"
-msgstr "アップグレードが終了しました"
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
 
-#: ../src/update-manager.in:434
-msgid "Another package manager is running"
-msgstr "他のパッケージマネージャが動いています"
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
 
-#: ../src/update-manager.in:436
+#: ../DistUpgrade/DistUpgradeControler.py:130
 msgid ""
-"You can run only one package management application at the same time. Please "
-"close this other application first."
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
 msgstr ""
-"同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケーショ"
-"ンマネージャを終了してください。"
 
-#: ../src/update-manager.in:455
-msgid "Updating package list..."
-msgstr "アップデートされるパッケージのリスト..."
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "キー削除のエラー"
 
-#: ../src/update-manager.in:457
-msgid "Installing updates..."
-msgstr "アップデートをインストール中..."
+#: ../DistUpgrade/DistUpgradeControler.py:165
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
 
-#: ../src/update-manager.in:658 ../src/update-manager.in:661
-msgid "Your system is up-to-date!"
-msgstr "システムは最新の状態です!"
+#: ../DistUpgrade/DistUpgradeControler.py:184
+msgid "Not enough free space"
+msgstr ""
 
-#: ../src/update-manager.in:659
-msgid "There are no updates available."
-msgstr "アップデートするものはありません。"
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
 
-#: ../src/update-manager.in:686
-#, c-format
-msgid "New version: %s"
-msgstr "新しいバージョン: %s"
+#: ../DistUpgrade/DistUpgradeControler.py:190
+msgid "Perform Upgrade?"
+msgstr ""
 
-#: ../src/update-manager.in:710
-msgid "Your distribution is no longer supported"
-msgstr "あなたのディストリビューションはすでにサポート対象外です。"
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
 
-#: ../src/update-manager.in:710
+#: ../DistUpgrade/DistUpgradeControler.py:201
 msgid ""
-"Please upgrade to a newer version of Ubuntu Linux. The version you are "
-"running will no longer get security fixes or other critical updates. Please "
-"see http://www.ubuntulinux.org for upgrade information."
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
 msgstr ""
-"新しいUbuntu Linuxにアップグレードしてください。現在お使いのシステムにはセ"
-"キュリティフィクスや危急のアップデートはすでに提供されていません。アップグ"
-"レードに関する情報は http://www.ubuntulinux.org/ を見てください。"
 
-#: ../src/update-manager.in:725
-msgid "There is a new release of Ubuntu available!"
-msgstr "Ubuntuの新しいリリース版があります！"
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
 
-#: ../src/update-manager.in:725
-#, c-format
+#: ../DistUpgrade/DistUpgradeControler.py:239
 msgid ""
-"A new release with the codename '%s' is available. Please see http://www."
-"ubuntulinux.org/ for upgrade instructions."
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
 msgstr ""
-"コードネーム '%s' という新しいリリース版があります。アップグレードするために "
-"http://www.ubuntulinux.org/ をご覧ください。"
 
-#: ../src/update-manager.in:729
-msgid "Never show this message again"
-msgstr "このメッセージを二度と表示しない"
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
 
-#: ../src/update-manager.in:817
-msgid "Unable to get exclusive lock"
-msgstr "排他的なロックができません"
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "アップグレードが終了しました"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
 
-#: ../src/update-manager.in:818
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#, fuzzy
+msgid "Installing updates ..."
+msgstr "アップデートをインストール中..."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
 msgid ""
-"This usually means that another package management application (like apt-get "
-"or aptitude) already running. Please close that application first"
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
 msgstr ""
-"同時にひとつのパッケージマネージャしか起動できません。先に atp-get や aptitudeのような"
-"他のパッケージマネージャを終了してください。"
 
-#: ../src/update-manager.in:842
-msgid "Initializing and getting list of updates..."
-msgstr "アップデートリストを取得中..."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>詳細</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Comment:</b>"
+#~ msgstr "<b>コメント:</b>"
+
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>コンポーネント</b>"
+
+#~ msgid "<b>Distribution:</b>"
+#~ msgstr "<b>ディストリビューション:</b>"
+
+#~ msgid "<b>Repository</b>"
+#~ msgstr "<b>リポジトリ</b>"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>セクション:</b>"
+
+#~ msgid "<b>Temporary files</b>"
+#~ msgstr "<b>一時ファイル</b>"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>タイプ:</b>"
+
+#~ msgid "<b>URI:</b>"
+#~ msgstr "<b>URI:</b>"
+
+#~ msgid "<b>User Interface</b>"
+#~ msgstr "ユーザインターフェース"
+
+#~ msgid ""
+#~ "<big><b>Authentication keys</b></big>\n"
+#~ "\n"
+#~ "You can add and remove authentication keys in this dialog. A key makes it "
+#~ "possible to verify the integrity of the software you download."
+#~ msgstr ""
+#~ "<big><b>認証鍵</b></big>\n"
+#~ "\n"
+#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完"
+#~ "全なものか確認することができます。"
+
+#~ msgid ""
+#~ "<big><b>Enter the complete APT line of the repository that you want to "
+#~ "add</b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and content of a repository, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+#~ "detailed description of the syntax in the documentation."
+#~ msgstr ""
+#~ "<big><b>追加したい APT line のレポジトリを入力してください。</b></big>\n"
+#~ "\n"
+#~ "APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb "
+#~ "http://ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式に"
+#~ "ついて書かれています。"
+
+#~ msgid "APT line:"
+#~ msgstr "APT line:"
+
+#~ msgid "A_uthentication"
+#~ msgstr "認証(_U)"
+
+#~ msgid ""
+#~ "Add a new key file to the trusted keyring. Make sure that you received "
+#~ "the key over a secure channel and that you trust the owner. "
+#~ msgstr ""
+#~ "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経"
+#~ "由で鍵を取得し、信頼される持ち主のものか確認してください。"
+
+#~ msgid "Automatically clean _temporary packages files"
+#~ msgstr "一時ファイルを自動的に削除する(_T)"
+
+#~ msgid ""
+#~ "Binary\n"
+#~ "Source"
+#~ msgstr ""
+#~ "バイナリ\n"
+#~ "ソース"
+
+#~ msgid "Clean interval in days: "
+#~ msgstr "削除する間隔(日): "
+
+#~ msgid "Delete _old packages in the package cache"
+#~ msgstr "パッケージキャッシュにある古いパッケージを削除する(_O)"
+
+#~ msgid "Edit Repository..."
+#~ msgstr "リポジトリの編集..."
+
+#~ msgid "Maximum age in days:"
+#~ msgstr "最長の保存期間(日):"
+
+#~ msgid "Maximum size in MB:"
+#~ msgstr "最大量(MB):"
+
+#~ msgid ""
+#~ "Restore the default keys shipped with the distribution. This will not "
+#~ "change user installed keys."
+#~ msgstr ""
+#~ "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更により"
+#~ "ユーザが追加した鍵が失われることはありません。"
+
+#~ msgid "Set _maximum size for the package cache"
+#~ msgstr "パッケージキャッシュの最大量を設定する(_M)"
+
+#~ msgid "Settings"
+#~ msgstr "設定"
+
+#~ msgid "Show disabled software sources"
+#~ msgstr "無効なソフトウェア取得元を表示"
+
+#~ msgid "Update interval in days: "
+#~ msgstr "アップデートする間隔(日): "
+
+#~ msgid "_Add Repository"
+#~ msgstr "リポジトリの追加(_A)"
+
+#~ msgid "_Custom"
+#~ msgstr "カスタム(_C)"
+
+#~ msgid "_Download upgradable packages"
+#~ msgstr "アップグレード可能なパッケージを取得する(_D)"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "アップデート可能なファイルの表示とインストール"
+
+#~ msgid "Update Manager"
+#~ msgstr "アップデートマネージャ"
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>インストールするパッケージ:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>アップデートがあります</b></big>\n"
+#~ "\n"
+#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれら"
+#~ "のパッケージがインストールされます。"
+
+#~ msgid ""
+#~ "Reload the package information from the server. \n"
+#~ "\n"
+#~ "If you have a permanent internet connection this is done automatically. "
+#~ "If you are behind an internet connection that needs to be started by hand "
+#~ "(e.g. a modem) you should use this button so that update-manager knows "
+#~ "about new updates."
+#~ msgstr ""
+#~ "サーバからパッケージ情報を読み込み直します。\n"
+#~ "\n"
+#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデム"
+#~ "などでそうではないなら、アップデートマネージャに新しいアップデートがあるか"
+#~ "どうかを知らせるため、このボタンを使用して手動で行う必要があります。"
+
+#~ msgid "Binary"
+#~ msgstr "バイナリ"
+
+#~ msgid "Source"
+#~ msgstr "ソース"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Ubuntu 5.04 Updates"
+#~ msgstr "Ubuntu 5.04 セキュリティアップデート"
+
+#~ msgid "Ubuntu 4.10 Security Updates"
+#~ msgstr "Ubuntu 4.10 セキュリティアップデート"
+
+#~ msgid "Contributed software"
+#~ msgstr "寄贈ソフトウェア"
+
+#~ msgid "Non-free software"
+#~ msgstr "非フリーソフトウェア"
+
+#~ msgid "US export restricted software"
+#~ msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア"
+
+#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+
+#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+
+#~ msgid "Repositories changed"
+#~ msgstr "リポジトリが変更されました"
+
+#~ msgid ""
+#~ "The repository information has changes. A backup copy of your sources."
+#~ "list is stored in %s.save. \n"
+#~ "\n"
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコ"
+#~ "ピーしました\n"
+#~ "\n"
+#~ "パッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?"
+
+#~ msgid "Your system has broken packages!"
+#~ msgstr "システムに壊れたパッケージがあります！"
+
+#~ msgid ""
+#~ "This means that some dependencies of the installed packages are not "
+#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
+#~ msgstr ""
+#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" ま"
+#~ "たは \"apt-get\" を使用して修正してください。 "
+
+#~ msgid "It is not possible to upgrade all packages."
+#~ msgstr "全てのパッケージをアップグレードすることは不可能です。"
+
+#~ msgid ""
+#~ "This means that besides the actual upgrade of the packages some further "
+#~ "action (such as installing or removing packages) is required. Please use "
+#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
+#~ "situation."
+#~ msgstr ""
+#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対"
+#~ "処がいるようです。Synaptic \"Smart Upgrade\"か\"apt-get dist-upgrade\"を実"
+#~ "行して問題を修正してください。"
+
+#~ msgid "The following packages are not upgraded: "
+#~ msgstr "これらのパッケージはアップグレードされません:"
+
+#~ msgid "Changes not found, the server may not be updated yet."
+#~ msgstr ""
+#~ "変更点は見つかりませんでした。サーバはまだアップデートされていないようで"
+#~ "す。"
+
+#~ msgid ""
+#~ "Failed to download changes. Please check if there is an active internet "
+#~ "connection."
+#~ msgstr ""
+#~ "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
+#~ "い。"
+
+#~ msgid "Version %s: \n"
+#~ msgstr "バージョン %s: \n"
+
+#~ msgid "Downloading changes..."
+#~ msgstr "変更点を取得中..."
+
+#~ msgid "The updates are being applied."
+#~ msgstr "アップデートされました。"
+
+#~ msgid "Another package manager is running"
+#~ msgstr "他のパッケージマネージャが動いています"
+
+#~ msgid ""
+#~ "You can run only one package management application at the same time. "
+#~ "Please close this other application first."
+#~ msgstr ""
+#~ "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケー"
+#~ "ションマネージャを終了してください。"
+
+#~ msgid "Updating package list..."
+#~ msgstr "アップデートされるパッケージのリスト..."
+
+#~ msgid "Your system is up-to-date!"
+#~ msgstr "システムは最新の状態です!"
+
+#~ msgid "There are no updates available."
+#~ msgstr "アップデートするものはありません。"
+
+#~ msgid "New version: %s"
+#~ msgstr "新しいバージョン: %s"
+
+#~ msgid "Your distribution is no longer supported"
+#~ msgstr "あなたのディストリビューションはすでにサポート対象外です。"
+
+#~ msgid ""
+#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
+#~ "running will no longer get security fixes or other critical updates. "
+#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ msgstr ""
+#~ "新しいUbuntu Linuxにアップグレードしてください。現在お使いのシステムにはセ"
+#~ "キュリティフィクスや危急のアップデートはすでに提供されていません。アップグ"
+#~ "レードに関する情報は http://www.ubuntulinux.org/ を見てください。"
+
+#~ msgid "There is a new release of Ubuntu available!"
+#~ msgstr "Ubuntuの新しいリリース版があります！"
+
+#~ msgid ""
+#~ "A new release with the codename '%s' is available. Please see http://www."
+#~ "ubuntulinux.org/ for upgrade instructions."
+#~ msgstr ""
+#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするため"
+#~ "に http://www.ubuntulinux.org/ をご覧ください。"
+
+#~ msgid "Never show this message again"
+#~ msgstr "このメッセージを二度と表示しない"
+
+#~ msgid "Unable to get exclusive lock"
+#~ msgstr "排他的なロックができません"
+
+#~ msgid ""
+#~ "This usually means that another package management application (like apt-"
+#~ "get or aptitude) already running. Please close that application first"
+#~ msgstr ""
+#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や "
+#~ "aptitudeのような他のパッケージマネージャを終了してください。"
+
+#~ msgid "Initializing and getting list of updates..."
+#~ msgstr "アップデートリストを取得中..."
 
-#: ../src/update-manager.in:865
-msgid "You need to be root to run this program"
-msgstr "rootで実行してください"
+#~ msgid "You need to be root to run this program"
+#~ msgstr "rootで実行してください"
 
 #~ msgid "Edit software sources and settings"
 #~ msgstr "ソフトウェアのソースと設定を編集"
diff --git a/po/pl.po b/po/pl.po
index daff9f28..83047bcf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-25 17:23+0100\n"
 "Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Aktualizacje internetowe</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -40,48 +41,51 @@ msgid "Authentication"
 msgstr "A_utentykacja"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Automatycznie sprawdzaj dostępność akt_ualizacji oprogramowania."
 
 #: ../data/SoftwareProperties.glade.h:7
 #, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Usuwa zaznaczony klucz z grupy zaufanych kluczy."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
 msgid "Installation Media"
 msgstr "Instalacja pakietów..."
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Przywraca domyślne klucze"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Ustawienia oprogramowania"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Szczegóły</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Pakiety do zainstalowania:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Dostępne aktualizacje</b></big>\n"
-"\n"
-"Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając "
-"przycisk Instaluj."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -91,53 +95,61 @@ msgstr ""
 "\n"
 "Trzeba pobrać informacje o zmianach z centralnego serwera"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Anuluj pobieranie pliku zmian (Changelog)"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Zmiany"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Opis"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Wczytaj ponownie"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Aktualizacje oprogramowania"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Aktualizowanie zakończone"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Instaluj"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Wczytaj ponownie"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -245,27 +257,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr "Wybierz plik z kluczem"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr "Błąd podczas importu wybranego pliku"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony."
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr "Błąd podczas usuwania klucza"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -273,14 +285,332 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+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:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "Błąd podczas usuwania klucza"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Aktualizowanie zakończone"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Aktualizowanie zakończone"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Szczegóły</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Pakiety do zainstalowania:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Dostępne aktualizacje</b></big>\n"
+#~ "\n"
+#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
+#~ "klikając przycisk Instaluj."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Komentarz:</b>"
 
@@ -351,9 +681,6 @@ msgstr ""
 #~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego "
 #~ "źródła. "
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Automatycznie sprawdzaj dostępność akt_ualizacji oprogramowania."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Usuwaj _tymczasowe pliki z pakietami"
 
@@ -379,9 +706,6 @@ msgstr ""
 #~ msgid "Maximum size in MB:"
 #~ msgstr "Maksymalny rozmiar pakietu w MB:"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Usuwa zaznaczony klucz z grupy zaufanych kluczy."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5d89aa2f..5a0195e7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-29 13:36-0300\n"
 "Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-status@listas.cipsga.org."
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -40,95 +40,106 @@ msgid "Authentication"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
+msgid "Automatically check for updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:7
-msgid "Installation Media"
+msgid "Import the public key from a trusted software provider"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:8
-msgid "Restore Defaults"
+msgid "Installation Media"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:9
-msgid "Software Preferences"
+msgid "Restore _Defaults"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
+msgid "<big><b>Install software updates</b></big>"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:3
 msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:6
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
 "Need to get the changes from the central server"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+msgid "Cancel downloading of the changelog"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Upgrade terminado"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr ""
 
+#: ../data/UpdateManager.glade.h:17
+msgid "_Reload"
+msgstr ""
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -231,27 +242,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -259,14 +270,314 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Upgrade terminado"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Upgrade terminado"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
 #~ msgid "<b>Components</b>"
 #~ msgstr "<b>Componentes</b>"
 
diff --git a/po/ro.po b/po/ro.po
index e93c650f..7c922c32 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-03 19:28+0200\n"
 "Last-Translator: Dan Damian <dand@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizări de pe Internet</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -40,48 +41,50 @@ msgid "Authentication"
 msgstr "A_utentificare"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Verifică a_utomat actualizările software."
 
 #: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Elimină cheia selectată din keyring-ul de încredere."
+
+#: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Restaurează cheile implicite."
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Preferinţe software"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Detalii</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-#, fuzzy
-msgid "<b>Packages to install:</b>"
-msgstr "Pachete de instalat:"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
-"<big><b>Actualizări disponibile</b></big>\n"
-"\n"
-"Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând "
-"pe butonul Instalează."
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
@@ -91,53 +94,60 @@ msgstr ""
 "\n"
 "Trebuiesc obţinute schimbările de pe serverul central"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Întrerupe descărcarea jurnalului de modificări"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Modificări"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Descriere"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Actualizări software"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Actualizare completă"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Instalează"
 
+#: ../data/UpdateManager.glade.h:17
+msgid "_Reload"
+msgstr ""
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -245,27 +255,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -273,14 +283,330 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Actualizare completă"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Actualizare completă"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>Detalii</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#, fuzzy
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "Pachete de instalat:"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Actualizări disponibile</b></big>\n"
+#~ "\n"
+#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
+#~ "apăsând pe butonul Instalează."
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Comentariu:</b>"
 
@@ -351,9 +677,6 @@ msgstr ""
 #~ "obţinut cheia printr-un canal sigur şi că aveţi încredere în proprietarul "
 #~ "ei."
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Verifică a_utomat actualizările software."
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "Curăţă automat fişierele _temporare ale pachetelor"
 
@@ -370,9 +693,6 @@ msgstr ""
 #~ msgid "Edit Repository..."
 #~ msgstr "Editează locaţia..."
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Elimină cheia selectată din keyring-ul de încredere."
-
 #, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
@@ -521,6 +841,3 @@ msgstr ""
 
 #~ msgid "0"
 #~ msgstr "0"
-
-#~ msgid "    "
-#~ msgstr "    "
diff --git a/po/rw.po b/po/rw.po
index dc7fcec0..95087049 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:1
 #, fuzzy
-msgid "<b>Internet Updates</b>"
+msgid "<b>Internet updates</b>"
 msgstr "<B B"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -48,48 +48,52 @@ msgid "Authentication"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "Kugenzura... kugirango"
 
 #: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "i Byahiswemo Urufunguzo Bivuye i"
+
+#: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Mburabuzi Utubuto"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-#, fuzzy
-msgid "<b>Details</b>"
-msgstr "<B B"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-#, fuzzy
-msgid "<b>Packages to install:</b>"
-msgstr "<B Kuri Kwinjiza porogaramu B"
+msgid "<big><b>Reading package information</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:3
 #, fuzzy
 msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
-msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto"
-
-#: ../data/UpdateManager.glade.h:6
-#, fuzzy
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
 "Need to get the changes from the central server"
@@ -97,13 +101,13 @@ msgstr ""
 "<Uburemere UTSINDAGIYE Ingano Kinini Amahinduka Kuri Kubona i Amahinduka "
 "Bivuye i Seriveri"
 
-#: ../data/UpdateManager.glade.h:9
+#: ../data/UpdateManager.glade.h:6
 #, fuzzy
-msgid "Cancel downloading the changelog"
+msgid "Cancel downloading of the changelog"
 msgstr "Iyimura... i"
 
 # officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Revision.Color.Change.text
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Amahinduka"
 
@@ -111,51 +115,58 @@ msgstr "Amahinduka"
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
 # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Isobanuramiterere"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-# sfx2/sdi\sfxslots.src:SID_RELOAD.text
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Kongera Gutangiza"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Ibihuzagihe bya porogaramumudasobwa "
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Byarangiye"
 
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 #, fuzzy
 msgid "_Install"
 msgstr "Kwinjiza porogaramu"
 
+# sfx2/sdi\sfxslots.src:SID_RELOAD.text
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Kongera Gutangiza"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -265,32 +276,32 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 #, fuzzy
 msgid "Choose a key-file"
 msgstr "a Urufunguzo IDOSIYE"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 #, fuzzy
 msgid "Error importing selected file"
 msgstr "Kuzaza Byahiswemo IDOSIYE"
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 #, fuzzy
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa"
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 #, fuzzy
 msgid "Error removing the key"
 msgstr "i Urufunguzo"
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 #, fuzzy
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -298,14 +309,330 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+#, fuzzy
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+#, fuzzy
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+#, fuzzy
+msgid "Error during update"
+msgstr "i Urufunguzo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Byarangiye"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Byarangiye"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<B B"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#, fuzzy
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<B Kuri Kwinjiza porogaramu B"
+
+#, fuzzy
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto"
+
 #, fuzzy
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<B B"
@@ -376,10 +703,6 @@ msgstr ""
 #~ msgstr "a Gishya Urufunguzo IDOSIYE Kuri i i Urufunguzo KURI a Na i"
 
 #, fuzzy
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Kugenzura... kugirango"
-
-#, fuzzy
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "GUSUKURA By'igihe gito Idosiye"
 
@@ -400,10 +723,6 @@ msgstr ""
 #~ msgstr "Ingano in"
 
 #, fuzzy
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "i Byahiswemo Urufunguzo Bivuye i"
-
-#, fuzzy
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
 #~ "change user installed keys."
diff --git a/po/sv.po b/po/sv.po
index 41438588..805e9ebc 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: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-26 15:14+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-uppdateringar</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -40,44 +41,49 @@ msgid "Authentication"
 msgstr "Autentisering"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
+msgid "Automatically check for updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
 #, fuzzy
 msgid "Installation Media"
 msgstr "Installationer"
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "Systemets standardalternativ"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "Programvaruinställningar"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>Detaljer</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
-msgstr "<b>Paket att installera:</b>"
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
@@ -88,53 +94,62 @@ msgstr ""
 "Använd detta verktyg för att konfigurera det sätt som ditt system kommer åt "
 "andra datorer"
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "Avbryt hämtningen av changelog"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "Ändringar"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "Läs om"
-
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:11
+#, fuzzy
+msgid "Show details"
+msgstr "Detaljer"
+
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "Programvaruuppdateringar"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "Uppgraderingar"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "_Installera"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "Läs om"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -242,28 +257,28 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Tillgängliga program"
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 #, fuzzy
 msgid "Choose a key-file"
 msgstr "Välj en spegel"
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -271,14 +286,327 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+#, fuzzy
+msgid "Broken packages"
+msgstr "paket"
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, fuzzy, python-format
+msgid "Can't install '%s'"
+msgstr "inte installerad"
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "Uppgraderingar"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+#, fuzzy
+msgid "Remove obsolete Packages?"
+msgstr " Ta bort paket "
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "Uppgraderingar"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+#, fuzzy
+msgid "Installing updates ..."
+msgstr "Letar efter uppdateringar..."
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, fuzzy, python-format
+msgid "To be installed: %s"
+msgstr "inte installerad"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+#, fuzzy
+msgid "Are you sure you want cancel?"
+msgstr "Är du säker på att du vill avsluta?"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+#, fuzzy
+msgid "Reboot required"
+msgstr "Krav"
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Details"
+msgstr "Detaljer"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+#, fuzzy
+msgid "Preparing upgrade"
+msgstr "Förbereder transaktion"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+#, fuzzy
+msgid "Upgrading the system"
+msgstr "Uppdaterar system"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#~ msgid "<b>Details</b>"
+#~ msgstr "<b>Detaljer</b>"
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Paket att installera:</b>"
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>Kommentar:</b>"
 
@@ -403,10 +731,6 @@ msgstr ""
 #~ msgid "Updating package list..."
 #~ msgstr "Hittade %d matchande paket"
 
-#, fuzzy
-#~ msgid "Installing updates..."
-#~ msgstr "Letar efter uppdateringar..."
-
 #~ msgid "Your system is up-to-date!"
 #~ msgstr "Ditt system är aktuellt!"
 
@@ -530,9 +854,6 @@ msgstr ""
 #~ msgid "User Interface"
 #~ msgstr "Användargränssnitt"
 
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
 #~ msgid "Install"
 #~ msgstr "Installera"
 
@@ -563,9 +884,6 @@ msgstr ""
 #~ msgid "There is no package signature for"
 #~ msgstr "Det finns ingen paketsignatur för"
 
-#~ msgid "Preparing Transaction"
-#~ msgstr "Förbereder transaktion"
-
 #~ msgid "Installing"
 #~ msgstr "Installerar"
 
@@ -1073,9 +1391,6 @@ msgstr ""
 #~ msgid "older"
 #~ msgstr "äldre"
 
-#~ msgid "not installed"
-#~ msgstr "inte installerad"
-
 #~ msgid "upgrade"
 #~ msgstr "uppgradera"
 
@@ -1117,9 +1432,6 @@ msgstr ""
 #~ msgid "Provides"
 #~ msgstr "Tillhandahållanden"
 
-#~ msgid "Requires"
-#~ msgstr "Krav"
-
 #~ msgid "Conflicts With"
 #~ msgstr "Är i konflikt med"
 
@@ -1166,9 +1478,6 @@ msgstr ""
 #~ msgid "%.1f%% completed"
 #~ msgstr "%.1f%% klart"
 
-#~ msgid "Updating System"
-#~ msgstr "Uppdaterar system"
-
 #~ msgid "Download cancelled"
 #~ msgstr "Hämtning avbruten"
 
@@ -1425,9 +1734,6 @@ msgstr ""
 #~ msgid "Untitled"
 #~ msgstr "Namnlös"
 
-#~ msgid "Are you sure you want to quit?"
-#~ msgstr "Är du säker på att du vill avsluta?"
-
 #~ msgid "_Pending Actions"
 #~ msgstr "_Förestående åtgärder"
 
@@ -2135,9 +2441,6 @@ msgstr ""
 #~ msgid " Update Now! "
 #~ msgstr " Uppdatera nu! "
 
-#~ msgid " Remove Packages "
-#~ msgstr " Ta bort paket "
-
 #~ msgid " Unsubscribe "
 #~ msgstr " Säg upp prenumeration "
 
@@ -2221,9 +2524,6 @@ msgstr ""
 #~ msgid "Downloading mirrors..."
 #~ msgstr "Hämtar speglar..."
 
-#~ msgid "packages"
-#~ msgstr "paket"
-
 #~ msgid "%%p%%%% (%s of %s)"
 #~ msgstr "%%p%%%% (%s av %s)"
 
diff --git a/po/xh.po b/po/xh.po
index 67b5135e..674393aa 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-30 13:25+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+msgid "<b>Internet updates</b>"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -39,97 +39,108 @@ msgid "Authentication"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
+msgid "Automatically check for updates"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
 #, fuzzy
 msgid "Installation Media"
 msgstr "Seka zonke izihlaziyo"
 
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Restore Defaults"
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Restore _Defaults"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 #, fuzzy
 msgid "Software Preferences"
 msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
+msgid "<big><b>Install software updates</b></big>"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-msgid "<b>Packages to install:</b>"
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:3
 msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:6
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
 "Need to get the changes from the central server"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+msgid "Cancel downloading of the changelog"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 #, fuzzy
 msgid "Software Updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../data/UpdateManager.glade.h:19
-msgid "Upgrade"
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
+msgid "U_pgrade"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr ""
 
+#: ../data/UpdateManager.glade.h:17
+msgid "_Reload"
+msgstr ""
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -232,27 +243,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -260,14 +271,312 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+msgid "Perform Upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Update Manager"
 #~ msgstr "UMlawuli woMqulu weNkqubo"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4315d5e1..c592a475 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: \n"
-"POT-Creation-Date: 2005-12-12 12:52+0100\n"
+"POT-Creation-Date: 2006-01-25 12:41+0100\n"
 "PO-Revision-Date: 2005-03-21 22:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Internet Updates</b>"
+#, fuzzy
+msgid "<b>Internet updates</b>"
 msgstr "<b>Internet 更新</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
@@ -40,97 +41,111 @@ msgid "Authentication"
 msgstr "身份验证(_U)"
 
 #: ../data/SoftwareProperties.glade.h:6
-msgid "Check for updates every"
-msgstr ""
+#, fuzzy
+msgid "Automatically check for updates"
+msgstr "自动检查软件更新(_U)。"
 
 #: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "从信任的密钥环中删除选中的密钥。"
+
+#: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr ""
 
-#: ../data/SoftwareProperties.glade.h:8
+#: ../data/SoftwareProperties.glade.h:9
 #, fuzzy
-msgid "Restore Defaults"
+msgid "Restore _Defaults"
 msgstr "恢复默认密钥"
 
-#: ../data/SoftwareProperties.glade.h:9
+#: ../data/SoftwareProperties.glade.h:10
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
 msgid "Software Preferences"
 msgstr "软件首选项"
 
-#: ../data/SoftwareProperties.glade.h:10
-msgid "day(s)"
+#: ../data/SoftwareProperties.glade.h:12
+msgid ""
+"daily\n"
+"every two days\n"
+"weekly\n"
+"every two weeks\n"
+"custom"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:1
-msgid "<b>Details</b>"
-msgstr "<b>细节</b>"
+msgid "<big><b>Install software updates</b></big>"
+msgstr ""
 
 #: ../data/UpdateManager.glade.h:2
-#, fuzzy
-msgid "<b>Packages to install:</b>"
-msgstr "要安装的软件包："
-
-#: ../data/UpdateManager.glade.h:3
-msgid ""
-"<big><b>Available Updates</b></big>\n"
-"\n"
-"The following packages are found to be upgradable. You can upgrade them by "
-"using the Install button."
+msgid "<big><b>Reading package information</b></big>"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:6
+#: ../data/UpdateManager.glade.h:3
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
 "\n"
 "Need to get the changes from the central server"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:9
-msgid "Cancel downloading the changelog"
+#: ../data/UpdateManager.glade.h:6
+#, fuzzy
+msgid "Cancel downloading of the changelog"
 msgstr "取消更新日志的下载"
 
-#: ../data/UpdateManager.glade.h:10
+#: ../data/UpdateManager.glade.h:7
 msgid "Changes"
 msgstr "更改"
 
-#: ../data/UpdateManager.glade.h:11
+#: ../data/UpdateManager.glade.h:8
 msgid "Description"
 msgstr "描述"
 
-#: ../data/UpdateManager.glade.h:12
-msgid "Release Notes"
+#: ../data/UpdateManager.glade.h:9
+msgid ""
+"Reading information about the installed packages. Depending on the speed of "
+"your computer this may take a bit."
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:13
-msgid "Reload"
-msgstr "重新装入"
+#: ../data/UpdateManager.glade.h:10
+msgid "Release Notes"
+msgstr ""
 
-#: ../data/UpdateManager.glade.h:14
-msgid ""
-"Reload the package information from the server. \n"
-"\n"
-"If you have a permanent internet connection this is done automatically. If "
-"you are behind an internet connection that needs to be started by hand (e.g. "
-"a modem) you should use this button so that update-manager knows about new "
-"updates."
+#: ../data/UpdateManager.glade.h:11
+msgid "Show details"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:12
 msgid "Show progress of single files"
 msgstr ""
 
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:13
 msgid "Software Updates"
 msgstr "软件更新"
 
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:14
+msgid ""
+"Software updates can fix possible security holes, fix possible errors, so "
+"called \"bugs\", or provide new features to you."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
 #, fuzzy
-msgid "Upgrade"
+msgid "U_pgrade"
 msgstr "更新已经完成"
 
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:16
 msgid "_Install"
 msgstr "安装(_I)"
 
+#: ../data/UpdateManager.glade.h:17
+#, fuzzy
+msgid "_Reload"
+msgstr "重新装入"
+
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -238,27 +253,27 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:208
+#: ../SoftwareProperties/SoftwareProperties.py:237
 msgid "Choose a key-file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:218
+#: ../SoftwareProperties/SoftwareProperties.py:247
 msgid "Error importing selected file"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:219
+#: ../SoftwareProperties/SoftwareProperties.py:248
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:231
+#: ../SoftwareProperties/SoftwareProperties.py:260
 msgid "Error removing the key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:232
+#: ../SoftwareProperties/SoftwareProperties.py:261
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:275
+#: ../SoftwareProperties/SoftwareProperties.py:304
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -266,14 +281,319 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:325
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:370
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeCache.py:87
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:88
+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:101
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:103
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:106
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:107
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:129
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:130
+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:193
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:194
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:201
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:202
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr ""
+
+#. FIXME: offer to write a new self.sources.list entry
+#: ../DistUpgrade/DistUpgradeControler.py:113
+msgid "No valid entry found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:114
+msgid ""
+"While scaning your repository information no valid entry for the upgrade was "
+"found.\n"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:129
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:130
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:164
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:165
+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:184
+msgid "Not enough free space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:185
+msgid ""
+"There is not enough free space on your system to download the required "
+"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
+"clean'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:190
+#, fuzzy
+msgid "Perform Upgrade?"
+msgstr "更新已经完成"
+
+#: ../DistUpgrade/DistUpgradeControler.py:200
+#: ../DistUpgrade/DistUpgradeControler.py:238
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:201
+msgid ""
+"Some problem occured during the upgrade. This is mostly a network problem, "
+"please check the network and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:231
+msgid "Remove obsolete Packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:239
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:273
+msgid "Checking update system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:265
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:279
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:283
+#, fuzzy
+msgid "Upgrading"
+msgstr "更新已经完成"
+
+#: ../DistUpgrade/DistUpgradeControler.py:289
+msgid "Searching for obsolete software"
+msgstr ""
+
+#. done, ask for reboot
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:66
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:99
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:122
+msgid "Installing updates ..."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#, python-format
+msgid "Error installing '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
+msgid ""
+"During the install a error occured. This is usually a bug in the packages, "
+"please report it. See the message below for more information. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:266
+#, python-format
+msgid ""
+"%s packages are going to be removed.\n"
+"%s packages are going to be newly installed.\n"
+"%s packages are going to be upgraded.\n"
+"\n"
+"%s needs to be fetched"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:277
+#, python-format
+msgid "<b>To be removed: %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:279
+#, python-format
+msgid "To be installed: %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:281
+#, python-format
+msgid "To be upgraded: %s"
+msgstr ""
+
+#. print "on_window_main_delete_event()"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:312
+msgid "Are you sure you want cancel?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:313
+msgid ""
+"Canceling during a upgrade can leave the system in a unstable state. It is "
+"strongly adviced to continue the operation. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:66
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:67
+msgid ""
+"The upgrade is finished now. A reboot is required to now, do you want to do "
+"this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:3
+msgid "<span weight=\"bold\" size=\"x-large\">Upgrading Ubuntu</span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:4
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+#, fuzzy
+msgid "Details"
+msgstr "<b>细节</b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "Preparing upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Upgrading software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Upgrading the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "_Restart Now"
+msgstr ""
+
+#, fuzzy
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "要安装的软件包："
+
 #~ msgid "<b>Comment:</b>"
 #~ msgstr "<b>注释：</b>"
 
@@ -307,9 +627,6 @@ msgstr ""
 #~ msgid "A_uthentication"
 #~ msgstr "身份验证(_U)"
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "自动检查软件更新(_U)。"
-
 #~ msgid "Automatically clean _temporary packages files"
 #~ msgstr "自动清理临时包文件(_T)"
 
@@ -326,9 +643,6 @@ msgstr ""
 #~ msgid "Edit Repository..."
 #~ msgstr "编辑仓库..."
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "从信任的密钥环中删除选中的密钥。"
-
 #~ msgid "Settings"
 #~ msgstr "设置"