* merge with mvo

50 files changed, 12697 insertions, 6102 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index c450d99d..267cb9c6 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,7 @@
+2006-05-08: 
+	- fix error when asking for media-change (ubuntu: 43442)
+2006-05-02: 
+        - upload
 2006-04-28:
         - add more sanity checking, if no valid mirror is found in the 
           sources.list ask for "dumb" rewrite
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index c89f6a34..b0c75fe4 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -396,7 +396,7 @@ class DistUpgradeControler(object):
                 #        (i.e. the error here could be something else than
                 #        missing sources entires but network errors etc)
                 logging.error("No '%s' after sources.list rewrite+update")
-                self._view.error(_("Inavlid package information"),
+                self._view.error(_("Invalid package information"),
                                  _("After your package information was "
                                    "updated the essential package '%s' can "
                                    "not be found anymore.\n"
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index f3ab2983..80575859 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -73,10 +73,11 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         # if this is set to false the download will cancel
         self.status = parent.label_status
         self.progress = parent.progressbar_cache
+        self.parent = parent
     def mediaChange(self, medium, drive):
       #print "mediaChange %s %s" % (medium, drive)
       msg = _("Please insert '%s' into the drive '%s'" % (medium,drive))
-      dialog = gtk.MessageDialog(parent=self.window_main,
+      dialog = gtk.MessageDialog(parent=self.parent.window_main,
                                  flags=gtk.DIALOG_MODAL,
                                  type=gtk.MESSAGE_QUESTION,
                                  buttons=gtk.BUTTONS_OK_CANCEL)
@@ -280,7 +281,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
         gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0))
         SimpleGladeApp.__init__(self, "DistUpgrade.glade",
                                 None, domain="update-manager")
-        self.window_main.set_keep_above(True)
+        # we dont use this currently
+        #self.window_main.set_keep_above(True)
         self.window_main.realize()
         self.window_main.window.set_functions(gtk.gdk.FUNC_MOVE)
         self._opCacheProgress = GtkOpProgress(self.progressbar_cache)
diff --git a/DistUpgrade/TODO b/DistUpgrade/TODO
index 9c4f503c..fd29d52d 100644
--- a/DistUpgrade/TODO
+++ b/DistUpgrade/TODO
@@ -1,12 +1,12 @@
 MUSTFIX:
 --------
+
 * debconf gnome dosn't work (can't connect to the session)
   [ should be fixed with the bugfix on gksu ]
 * display a message that all applications should be closed for the 
   dist-upgrade (and that strange things like a crashing panel can
   happen)
   [done in current dialog]
-
 * sources.list edit needs to add valid sources if all other sources
   are commented out
   (or for sources that can't be identified and rewrite ask the user
@@ -16,8 +16,7 @@ MUSTFIX:
   [Done]
 * fix "no activity for 120s warning" being repeated every sec in the logs
   [Done]
-* use the dialog frontend (for debconf) and detect the ansi sequence that
-  clear the screen and expand the terminal then 
+
 * [fabbio]: we probably don't want to remove stuff that moved from main
   to universe (if the user has only main enabled this is considered 
   obsolete). It would also be nice inform about packages that went from
@@ -28,6 +27,8 @@ MUSTFIX:
                         text (as \n\n\n\n\n... for cls)
 * add "add cdrom" to the "Do upgrade?" screen? And recalc the download 
   size again then :) ?
+* set bigger timeout than 120s?
+* make the sources.list rewrite even more robust (see launchpad #41023)
 
 breezy->dapper
 --------------
diff --git a/DistUpgrade/mirrors.txt b/DistUpgrade/mirrors.txt
index e18f3616..16b25731 100644
--- a/DistUpgrade/mirrors.txt
+++ b/DistUpgrade/mirrors.txt
@@ -31,9 +31,11 @@ rsync://gd.tuwien.ac.at/ubuntu/archive/
 
 #===Belgium===
 http://ftp.belnet.be/pub/mirror/ubuntu.com/
+http://ftp.belnet.be/packages/ubuntu/ubuntu
 http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/
 http://mirror.freax.be/ubuntu/archive.ubuntu.com/
 ftp://ftp.belnet.be/pub/mirror/ubuntu.com/
+ftp://ftp.belnet.be/packages/ubuntu/ubuntu
 ftp://ubuntu.mirrors.skynet.be/pub/ubuntu.com/
 
 #===Brazil===
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 4357a436..4c082f21 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -150,9 +150,9 @@ class MyCache(apt.Cache):
                                             "later."), srcpkg]
         except IOError:
             if lock.locked():
-                self.all_changes[name] = [_("Failed to download the list"
+                self.all_changes[name] = [_("Failed to download the list "
                                             "of changes. Please "
-                                            "check your internet "
+                                            "check your Internet "
                                             "connection."), srcpkg]
         if lock.locked():
             lock.release()
diff --git a/debian/changelog b/debian/changelog
index 848d5c6d..8e2a1fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+update-manager (0.42.2ubuntu15) dapper; urgency=low
+
+  * disable the install button if there no updates (ubuntu: #42284)
+    (Thanks to Sebastian Heinlein)
+  * show main window *after* restoring the size (ubuntu: #42277)
+    (Thanks to Sebastian Heinlein)
+  * fix broken spelling, typos, wording (ubuntu: #42431, #28777, 
+    #40425, #40727)
+  * help/C: merged from the docteam svn (ubuntu: 36092)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  2 May 2006 12:13:59 +0200
+
 update-manager (0.42.2ubuntu14) dapper; urgency=low
 
   * wording/glade file fixes (thanks to Sebastian Heinlein)
diff --git a/debian/control b/debian/control
index 691eba0c..6a1e80bc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: update-manager
 Section: gnome
 Priority: optional
-Maintainer: Michiel Sikkes <michiel@eyesopened.nl>
-Build-Depends: debhelper (>= 4.0.0), libxml-parser-perl, scrollkeeper, intltool, python-dev
-Standards-Version: 3.6.1.1
+Maintainer: Michael Vogt <michael.vogt@ubuntu.com>
+Build-Depends-Indep: debhelper (>= 4.0.0), libxml-parser-perl, scrollkeeper, intltool, python-dev
+Standards-Version: 3.6.2
 
 Package: update-manager
 Architecture: all
diff --git a/help/C/update-manager-C.omf b/help/C/update-manager-C.omf
index 3d0f8909..a4e6aabc 100644
--- a/help/C/update-manager-C.omf
+++ b/help/C/update-manager-C.omf
@@ -1,16 +1,15 @@
 <?xml version="1.0" standalone="no"?>
 <omf>
  <resource>
-  <creator>sean@inwords.co.za (Sean Wheller)</creator>
-  <title>Update Manager Manual</title>
+  <creator>sean@inwords.co.za (Sean Wheller) </creator>
+  <title>Update Manager Manual </title>
   <date>2005-03-04 </date>
   <version identifier="0.0.1" date="2005-03-04" description="First Release"/>
-  <subject category="Applications"/>
-  <description> Keep the software on your system up-to-date.</description>
+  <subject category="System|Administration"/>
+  <description> This document explains how to use the Update Manager. </description>
   <type>manual </type>
   <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-  <identifier
-  url="file:/usr/share/gnome/help/update-manager/C/update-manager.xml"/>
+  <identifier url=""/>
   <language code="C"/>
   <relation seriesid="e7ae3bcc-8ce0-11d9-8fa9-d1fb3a9076bb"/>
   <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html"
diff --git a/help/C/update-manager.xml b/help/C/update-manager.xml
index ef1d7f02..55143847 100644
--- a/help/C/update-manager.xml
+++ b/help/C/update-manager.xml
@@ -8,11 +8,11 @@
 <!--
       (Do not remove this comment block.)
   Version: 0.0.3
-  Last modified: March 26, 2005
+  Last modified: March 24, 2006
   Maintainers:
                Sean Wheller  <sean@inwords.co.za>
                Jeff Schering <jeffschering@gmail.com>
-               
+               Jerome S. Gotangco <jgotangco@ubuntu.com
   Translators:
                (translators put your name and email here)
 -->
@@ -23,7 +23,7 @@
   <articleinfo>
     <title>Update Manager Manual</title>
     <copyright>
-      <year>2005</year>
+      <year>2006</year>
       <holder>In Words</holder>
     </copyright>
     <!-- translators: uncomment this:
@@ -62,6 +62,11 @@
         <surname>Schering</surname>
         <contrib>Editor</contrib>
       </othercredit>
+      <othercredit role="maintainer">
+        <firstname>Jerome</firstname>
+        <surname>Gotangco</surname>
+        <contrib>Maintainer</contrib>
+      </othercredit>
       <!-- This is appropriate place for other contributors: translators,
       maintainers,  etc. Commented out by default.
        <othercredit role="translator">
@@ -131,7 +136,7 @@
       </revision>
     </revhistory>
     <releaseinfo>This manual explains how to use Update Manager, an apt update
-      management application for the GNOME desktop created by the Ubuntu Linux
+      management application for the GNOME desktop created by the Ubuntu
       project.</releaseinfo>
     <legalnotice>
       <title>Feedback</title>
@@ -193,7 +198,7 @@
           <command>apt-get</command>. To install <application>Update
         Manager</application> from the command line:</para>
 <programlisting>
-sudo apt-get update-manager
+sudo apt-get install update-manager
 </programlisting>
       <para>
         <application>Update Manager</application> is dependent on the following
@@ -1011,7 +1016,7 @@ gpg -recv-key --keyserver www.keyserver.net
       Sikkes <email>michiel@eyeopened.nl</email> and Michael Vogt
         <email>michael.vogt@ubuntu.com</email> as an
       <application>apt</application> update manager for the GNOME Desktop of the
-      Ubuntu Linux distribution. The user manual was written by Sean Wheller
+      Ubuntu distribution. The user manual was written by Sean Wheller
         <email>sean@inwords.co.za</email>.</para>
     <para>To report a bug or make a suggestion regarding this package or this
       manual, send mail to <email>ubuntu-users@lists.ubuntu.com</email>.</para>
diff --git a/po/bg.po b/po/bg.po
index 733d969b..9a0951a2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,28 +8,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:18+0000\n"
-"Last-Translator: Rostislav Raykov <nostalgiafed@gmail.com>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-01 16:56+0000\n"
+"Last-Translator: Kamen Lichev <kamenlitchev@abv.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Ежедневно"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Всеки два дни"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Ежеседмично"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Всеки две седмици"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Всеки %s дни"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "След една седмица"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "След две седмици"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "След един месец"
 
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "След %s дни"
 
 #: ../SoftwareProperties/SoftwareProperties.py:422
 msgid "Import key"
-msgstr ""
+msgstr "Внасяне на ключ"
 
 #: ../SoftwareProperties/SoftwareProperties.py:432
 msgid "Error importing selected file"
@@ -37,7 +65,7 @@ msgstr "Грешка при внасяне на избрания файл"
 
 #: ../SoftwareProperties/SoftwareProperties.py:433
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Избраният файл или не е GPG файл или е повреден."
+msgstr "Избраният файл или не е GPG файл, или е повреден."
 
 #: ../SoftwareProperties/SoftwareProperties.py:445
 msgid "Error removing the key"
@@ -46,7 +74,7 @@ msgstr "Грешка при премахване на ключа"
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
+"Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като "
 "грешка."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
@@ -56,51 +84,56 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<big><b>Грешка при сканиране на CD</b></big>\n"
+"\n"
+"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:544
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Моля, въведете име за диска"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Моля, поставете диск в устройството:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Повредени пакети"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"Системата Ви съдържа повредени пакети, които не могат да бъдат поправени с "
+"този софтуер. Моля, поправете ги със synaptic или apt-get преди да "
+"продължите!"
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Не може да бъдат надградени изисквани мета-пакети"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Ще трябва да бъде премахнат важен пакет"
 
 #. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Не може да бъде планирано надграждането"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
-"грешка. "
+"Възникна непреодолим проблем при планиране на надграждането. Докладвайте "
+"това като грешка. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Грешка при удостоверяването автентичността на някои пакети"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
 msgid ""
@@ -108,25 +141,27 @@ msgid ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"Не беше възможно да се удостовери автентичността на някои пакети. Това може "
+"да е временен проблем с мрежата. Може би бихте искали да опитате отново по-"
+"късно. Вижте по-долу списъка на неудоствоерените пакети."
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Не може да се инсталира \"%s\""
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
-"грешка. "
+"Не можеше да бъде инсталиран нужен пакет. Моля, докладвайте това като "
+"грешка! "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Не могат да бъдат предположени мета-пакети"
 
 #: ../DistUpgrade/DistUpgradeCache.py:242
 msgid ""
@@ -136,277 +171,348 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Системата Ви не съдържа ubuntu-desktop, kubuntu-desktop или edubuntu-desktop "
+"пакет и не бе възможно засичането на версията на Ubuntu, която ползвате.\n"
+" Моля, преди да продължите, инсталирайте един от тези пакети, като "
+"използвате synaptic или apt-get!"
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr ""
+msgstr "Четене на кеша"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Не е открит валиден огледален сървър"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
+"Докато бе преглеждана информацията от хранилището, не бе открит запис за "
+"огледален сървър за надграждането. Това може да се случи, ако използвате "
+"вътрешен огледален сървър или информацията за сървъра е остаряла.\n"
+"\n"
+"Желаете ли въпреки това да бъде презаписан файлът \"sources.list\"? Ако тук "
+"изберете \"Да\", всички записи \"%s \" ще бъдат актуализирани на \"%s\".\n"
+"Ако изберете \"Не\", актуализирането ще бъде отменено."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Генериране на източници по подразбиране?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
+"След преглеждане на Вашия \"sources.list\" не бе открит валиден запис за \"%s"
+"\".\n"
+"\n"
+"Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", "
+"актуализацията ще бъде отменена."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Информацията от хранилището е невалидна"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Надграждане на информацията от хранилището доведе до невалиден файл. Моля, "
+"съобщете това като грешка!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Забранени са източници от трети страни"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Някои записи от трети страни във Вашия \"souces.list\" бяха забранени. "
+"Можете да ги разрешите отново след надграждането чрез инструмента software-"
+"properties или чрез synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
-msgstr "Грешка при премахване на ключа"
+msgstr "Грешка по време на надграждане"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Недостатъчно свободно място на диска"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Надстройването се прекратява. Моля, освободете поне %s дисково пространство! "
+"Изпразнете кошчето и премахнете временните пакети на предходни инсталации, "
+"като използвате 'sudo apt-get clean'!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Желаете ли да започне надграждането?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Не можеше да бъдат инсталирани надгражданията"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
+"Надграждането сега ще бъде прекратено. Системата Ви може да е в "
+"неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Не можеше да бъдат свалени надгражданията"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Надграждането се прекратява. Моля, проверете Интернет връзката или "
+"инсталационния носител и опитайте отново! "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Премахване на остарелите пакети?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
-msgstr ""
+msgstr "П_рескачане на стъпката"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
-msgstr ""
+msgstr "_Премахване"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
-msgstr ""
+msgstr "Грешка при прехвърляне"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 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:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
-msgstr "Друга програма за управление на пакетите е стартирана."
+msgstr "Проверка на диспечера на пакети"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
-msgstr ""
+msgstr "Актуализиране информацията от хранилището"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Невалидна информация за пакет"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"След актуализиране не  информацията, важния пакет \"%s\" вече не може да "
+"бъде открит.\n"
+"Това показва сериозна грешка. Моля, съобщете за това!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Запитване за потвърждение"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
-msgstr "Обновлението е завършено"
+msgstr "Надграждане"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Търсене на остарял софтуер"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Надграждането на системата завърши."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Моля, поставете диск \"%s\" в устройство \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
-msgstr ""
+msgstr "Свалянето е завършено"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Сваляне на файл %li от %li при %s/сек"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "Остават %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
-msgstr ""
+msgstr "Изтегляне на файл %li от общо %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
-msgstr "Сваляне на промените..."
+msgstr "Прилагане на промените"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Не можеше да бъде инсталиран \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
-"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
-"грешка."
+msgstr "Надграждането се преустановява. Моля, съобщете това като грешка!"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
+"Замяна на конфигурационния файл\n"
+"\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Командата \"diff\" не бе намерена"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Възникна фатална грешка"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
+"Моля, съобщете това като грешка и включете файловете \"/var/log/dist-upgrade."
+"log\" и \"/var/log/dist-upgrade-apt.log\" във Вашия доклад. Надграждането "
+"сега ще бъде прекратено.\n"
+"Оригиналният \"sources.list\" was saved inбе съхранен в \"/etc/apt/sources."
+"list.distUpgrade\"."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Пакетът %s ще бъде премахнат."
+msgstr[1] "Пакетите %s ще бъдат премахнати."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s нов пакет ще бъде инсталиран."
+msgstr[1] "%s нови пакети ще бъдат инталирани."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s пакет ще бъде надграден."
+msgstr[1] "%s нови пакети ще бъдат надградени."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Трябва да изтеглите данни общо %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
+"Надграждането може да отнеме няколко часа, като не може да бъде отменено по-"
+"нататък."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"За да предодвратите загуба на данни, затворете всички отворени приложения и "
+"документи."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Не можеше да бъдат намерени надграждания"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "Системата Ви вече е надградена."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Премахване на %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Инсталиране на %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Надграждане на %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
-msgstr ""
+msgstr "Нужно е рестартиране"
 
 #: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
-msgstr ""
+msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -424,191 +530,202 @@ msgid ""
 "The system could be in an unusable state if you cancel the upgrade. You are "
 "strongly adviced to resume the upgrade."
 msgstr ""
+"<b><big>Отмяна на протичащото надграждане?</big></b>\n"
+"\n"
+"Системата Ви може да се окаже в неузползваемо състояние, ако отмените "
+"надграждането. Силно препоръчвано е да възобновите надграждането!"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Рестратирайте системата, за да завършите надграждането</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Започване на надграждането?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Надграждане до Ubuntu \"Dapper\" "
+"6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Почистване"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Допълнителна информация</b>"
+msgstr "<b>Детайли</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Разлика между файловете"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Изтегляне и инсталиране на надграждането"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Промяна на софтуерните канали"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Подготвяне на надграждането"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Рестартиране на системата"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "Надграждане на Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
-msgstr ""
+msgstr "_Задържане"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
 msgid "_Replace"
-msgstr "Презареждане"
+msgstr "_Замяна"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Съобщи грешка"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Рестартирай сега"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Поднови надграждането"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Не бяха открити бележки към изданието"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Сървърът може да е претоварен. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Не можеше да бъдат свалени бележките към изданието"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Моля, проверете Интернет връзката си!"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Не може да бъде стартирана помощната програма за надграждане."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
-"грешка. "
+"Това най-верроятно е грешка в помощната програма за надграждане. Моля, "
+"съобщете това като грешка!"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Сваляне на промените"
+msgstr "Изтегляне на помощната програма за надграждане"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
+"Помощната програма за надграждане ще Ви води през процеса на надграждане."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Подпис на помощната програма за надграждане"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Помощна програма за надграждане"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Грешка при доставянето"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Доставянето на надграждането бе неуспешно. Възможно е да има проблем с "
+"мрежата. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Грешка при извличането"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Извличането на надграждането бе неуспешно. Възможно е да има проблем с "
+"мрежата или сървъра. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Грешка при удостоверяване"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Удостоверяването на надграждането не успя. Възможно е да има проблем с "
+"мрежата или със сървъра. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Идентифициране"
+msgstr "Идентификацията неуспешна"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Идентификацията на надграждането е неуспешна. Възможно е да има проблем с "
+"мрежата или сървъра. "
 
 #: ../UpdateManager/GtkProgress.py:107
 #, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr ""
+msgstr "Сваляне на файл %li от %li при %s/сек"
 
 #: ../UpdateManager/GtkProgress.py:111
 #, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr ""
+msgstr "Сваляне на файл %li от %li при неизвестна скорост"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Неуспех при сваляне на промените. Проверете дали има активна връзка към "
-"интернет."
+"Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
+"връзката си!"
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Проверка за обновления..."
+msgstr "Не могат да бъдат инсталирани всички актуализации"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -616,102 +733,100 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Някои актуализации изискват премахването на допълнителен софтуер. "
+"Използвайте функцията „Маркиране на всички актуализации” на Диспечера на "
+"пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в терминален "
+"прозорец, за да актуализирате напълно системата си."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "Следните актуализации ще бъдат пропуснати:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версия %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Сваляне на промените"
+msgstr "Сваляне на списъка с промени..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Сваляне на промените"
+msgstr "Размер за изтегляне: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Програмите са обновени до последните версии!"
+msgstr "Системата Ви е актуална"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Инсталиране на обновленията..."
-msgstr[1] "Инсталиране на обновленията..."
+msgstr[0] "Можете да инсталирате %s актуализация"
+msgstr[1] "Можете да инсталирате %s актуализации"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "<b>Допълнителна информация</b>"
+msgstr "Скрий детайлите"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
-msgstr ""
+msgstr "Покажи детайлите"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Моля, изчакайте! Това може да отнеме известно време."
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr ""
+msgstr "Актуализацията е завършена"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Нова версия: %s (Размер: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr "Вашата дистрибуция вече не се поддържа"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Повече няма да получавате поправки за сигурността и критични актуализации. "
+"Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com "
+"за повече информация за надграждането!"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Позволено е да оперира само един диспечер на софтуера в даден момент"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Моля, затворете всички други приложения, преди всичко \"aptitude\" или "
+"\"Synaptic\"."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Индексът на софтуера е повреден"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Невъзможно е да бъде инсталиран или премахнат какъвто и да е софтуер. Моля, "
+"ползвайте диспечера на пакети \"Synaptic\" или първо задействайте \"sudo apt-"
+"get install -f\" в терминален прозорец, за да поправите този проблем!"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -720,22 +835,30 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Ще трябва ръчно да проверите за актуализации</big></b>\n"
+"\n"
+"Системата Ви не проверява автоматично за актуализации. Можете да настроите "
+"това в „Система” -> „Администрация” -> „Свойства на софтуера”"
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
+"<big><b>Преглеждане на системата Ви</b></big>\n"
+"\n"
+"Софтуерните актуализации поправят грешки, премахват уаизвими места в "
+"сигурността и предлагат нови възможности."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Поддържане на системата в съвременно състояние</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Отмяна на _изтеглянето"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
@@ -743,11 +866,11 @@ msgstr "Промени"
 
 #: ../data/UpdateManager.glade.h:10
 msgid "Chec_k"
-msgstr ""
+msgstr "_Проверка"
 
 #: ../data/UpdateManager.glade.h:11
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Проверка на софтуерните канали за нови актуализации"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -755,52 +878,51 @@ msgstr "Описание"
 
 #: ../data/UpdateManager.glade.h:13
 msgid "Release Notes"
-msgstr ""
+msgstr "Бележки към изданието"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Показване напредъка на отделните файлове"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
-msgstr "Обновления на софтуера"
+msgstr "Актуализации на софтуера"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
+"Софтуерните актуализации поправят грешки, премахват уаизвими места в "
+"сигурността и предлагат нови възможности."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
-msgstr ""
+msgstr "_Надграждане"
 
 #: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Надграждане до последната версия на Ubuntu"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr ""
+msgstr "_Проверка"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Скрий тази информация за в бъдеще"
 
 #: ../data/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Install Updates"
-msgstr "Инсталиране на обновленията..."
+msgstr "_Инсталиране на актуализациите"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>Ключове</b>"
+msgstr "<b>Канали</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr "<b>Обноввявания по Интернет</b>"
+msgstr "<b>Актуализации по Интернет</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
 msgid "<b>Keys</b>"
@@ -808,7 +930,7 @@ msgstr "<b>Ключове</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "Добавяне на Cdrom"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -816,55 +938,51 @@ msgstr "Идентифициране"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Изтриване на изтеглените софтуерни файлове:"
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Премахване на избрания ключ от доверената верига ключове."
+msgstr "Внасяне на публичния ключ от доверен доставчик на софтуер"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr "Носител на инсталацията"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Обноввявания по Интернет</b>"
+msgstr "<b>Актуализации по Интернет</b>"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
+"Само актуализации на сигурността от официалните сървъри на Ubuntu ще бъдат "
+"инсталирани автоматично"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Връщане на стандартните стойности"
+msgstr "Връщане на _стандартните стойности"
 
 #: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "Възвръщане на стандартните ключове"
+msgstr "Връщане на стандартните ключове на Вашата дистрибуция"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
-msgstr "Настройки за софтуера"
+msgstr "Настройки на софтуера"
 
 #: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "Проверка за обновления на всеки"
+msgstr "_Проверявай за актуализации автоматично:"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgstr "И_зтегли актуализациите във фонов режим, но не ги инсталирай"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Инсталирай актуализациите на сигурноста без потвърждение"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
@@ -879,23 +997,26 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Информацията за канала е остаряла</big></b>\n"
+"\n"
+"Ще трябва да презаредите информацията за канала, за да инсталирате софтуер и "
+"актуализации от новодобавени или променени канали.\n"
+"\n"
+"Нужна Ви е Интернет връзка, за да продължите."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>Ключове</b>"
+msgstr "<b>Канал</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
 msgid "<b>Components:</b>"
-msgstr "<b>Компоненти</b>"
+msgstr "<b>Компоненти:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
 msgstr "<b>Компоненти</b>"
 
@@ -912,20 +1033,18 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Добавете пълния ред на хранилището за APT, което искате да добавите</"
-"b></big>\n"
+"<big><b>Добавете пълния APT ред за канала, който искате да добавите</b></"
+"big>\n"
 "\n"
-"APT редът съдържа вида, местонахождението и съдържанието на хранилището. "
-"Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете "
-"подробно описание на синтаксиса в документацията."
+"APT редът съдържа вида, местонахождението и компонентите за даден канал. "
+"Например <i>„deb http://ftp.debian.org sarge main“</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -933,54 +1052,56 @@ msgstr "Ред за APT:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Добавяне на канал"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
-"Двоични\n"
+"Двоичен\n"
 "Изходен код"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Редакция на канал"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Сканиране на CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
+#, fuzzy
 msgid "_Add Channel"
-msgstr ""
+msgstr "_Добави канал"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
 msgstr "_Лично"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "Презареждане"
+msgstr "_Презареждане"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Показване и инсталация на наличните актуализации"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Управление на обновленията"
+msgstr "Диспечер на актуализациите"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Автоматична проверка за наличието на нова версия на текущата дистрибуция и "
+"предлагане да се надгради (ако е възможно)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Проверка за нови версии на дистрибуцията"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -988,32 +1109,37 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Ако е забланена автоматичната проверка за актуализации, ще трябва ръчно да "
+"презареждате списъка с канали. Тази опция позволява в този случай да се "
+"скрие напомнянето."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Припомни за презареждане на списъка с канали"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Покажи подробностите за актуализациите"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Съхранява размера на update-manager диалога"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Съхранява състоянието на разширения панел, който съдържа списъка с промени и "
+"описанието"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "Размерът на прозореца"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure software channels and internet updates"
-msgstr ""
+msgstr "Настройка на софтуерните канали и актуализациите по Интернет"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1023,80 +1149,73 @@ msgstr "Настройки на софтуера"
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
 msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 обновления"
+msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
 msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 обновления по сигурността"
+msgstr "Ubuntu 6.06 актуализации на сигурността"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
 msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.10 обновления"
+msgstr "Ubuntu 6.06 актуализации"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
 msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.10 обновления"
+msgstr "Ubuntu 6.06 Състарени версии"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD с Ubuntu 5.10 „Breezy Badger“"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 обновления по сигурността"
+msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 обновления"
+msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 обновления"
+msgstr "Ubuntu 5.10 Състарени версии"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
-msgstr "Официално поддържан"
+msgstr "Официално поддържани"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
-msgstr "Ограничен от правата"
+msgstr "Ограничени авторски права"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr "Поддържан от обществото (Universe)"
+msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr "Несвободен (Multiverse)"
+msgstr "Несвободни (Multiverse)"
 
 #. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../channels/Debian.info.in:6
@@ -1106,44 +1225,40 @@ msgstr "Debian 3.1 „Sarge“"
 #. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable обновления по сигурността"
+msgstr "Debian 3.1 \"Sarge\" актуализации на сигурността"
 
 #. Description
 #: ../channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian Testing"
+msgstr "Debian \"Etch\" (тестване)"
 
 #. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (Unstable)"
+msgstr "Debian \"Sid\" (нестабилен)"
 
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-съвместим софтуер с несвободни зависимости"
 
 #. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Софтуер несъвместим с DFSG"
 
-#, fuzzy
 #~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Раздели:</b>"
+#~ msgstr "<b>Раздели</b>"
 
 #, fuzzy
 #~ msgid "Oficially supported"
diff --git a/po/bn.po b/po/bn.po
new file mode 100644
index 00000000..407ed382
--- /dev/null
+++ b/po/bn.po
@@ -0,0 +1,1148 @@
+# Bengali translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-20 22:08+0000\n"
+"Last-Translator: Jamil Ahmed <itsjamil@gmail.com>\n"
+"Language-Team: Bengali <bn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:111
+#, python-format
+msgid "Every %s days"
+msgstr "প্রতি %s দিনে"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:141
+#, python-format
+msgid "After %s days"
+msgstr "%s দিন পর"
+
+#: ../SoftwareProperties/SoftwareProperties.py:422
+msgid "Import key"
+msgstr "কী ইম্পোর্ট"
+
+#: ../SoftwareProperties/SoftwareProperties.py:432
+msgid "Error importing selected file"
+msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে"
+
+#: ../SoftwareProperties/SoftwareProperties.py:433
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:445
+msgid "Error removing the key"
+msgstr "কী সরাতে সমস্যা হয়েছে"
+
+#: ../SoftwareProperties/SoftwareProperties.py:446
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:487
+#, python-format
+msgid ""
+"<big><b>Error scaning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:544
+msgid "Please enter a name for the disc"
+msgstr "ডিস্কের জন্য একটি নাম দিন"
+
+#: ../SoftwareProperties/SoftwareProperties.py:560
+msgid "Please insert a disc in the drive:"
+msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:93
+msgid ""
+"Your system contains broken packages that couldn't be fixed with this "
+"software. Please fix them first using synaptic or apt-get before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:135
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:142
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:145
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:146
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:169
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:170
+msgid ""
+"It was not possible to authenticate some packages. This may be a transient "
+"network problem. You may want to try again later. See below for a list of "
+"unauthenticated packages."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:233
+#, python-format
+msgid "Can't install '%s'"
+msgstr "'%s' ইন্সটল করা যাচ্ছে না"
+
+#: ../DistUpgrade/DistUpgradeCache.py:234
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"একটি প্রয়োজনীয় প্যাকেজ ইন্সটল করা অসম্ভব ছিল। অনুগ্রহ করে একে একটি বাগ হিসাবে "
+"রিপোর্ট করুন। "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:241
+msgid "Can't guess meta-package"
+msgstr "meta-package অনুমান করা যাচ্ছ না"
+
+#: ../DistUpgrade/DistUpgradeCache.py:242
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr "ক্যাশ পড়া হচ্ছে"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
+msgid "Repository information invalid"
+msgstr "রিপোজিটরির তথ্য সঠিক নয়"
+
+#: ../DistUpgrade/DistUpgradeControler.py:180
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+"রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ "
+"হিসাবে রিপোর্ট করুন।"
+
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
+msgid "Error during update"
+msgstr "আপগ্রেড করার সময় সমস্যা"
+
+#: ../DistUpgrade/DistUpgradeControler.py:234
+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:253
+msgid "Not enough free disk space"
+msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই"
+
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#, python-format
+msgid ""
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:260
+msgid "Do you want to start the upgrade?"
+msgstr "আপনি কি আপগ্রেড শুরু করতে চান?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:277
+msgid "Could not install the upgrades"
+msgstr "আপগ্রেড ইন্সটল করা যায় নি"
+
+#: ../DistUpgrade/DistUpgradeControler.py:278
+msgid ""
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"was run (dpkg --configure -a)."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "Could not download the upgrades"
+msgstr "আপগ্রেড ডাউনলোড করা যায় নি"
+
+#: ../DistUpgrade/DistUpgradeControler.py:294
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:336
+msgid "Remove obsolete packages?"
+msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:337
+msgid "_Skip This Step"
+msgstr "এই ধাপটি এড়িয়ে যাও (_S)"
+
+#: ../DistUpgrade/DistUpgradeControler.py:337
+msgid "_Remove"
+msgstr "সরাও (_R)"
+
+#: ../DistUpgrade/DistUpgradeControler.py:347
+msgid "Error during commit"
+msgstr "প্রেরণ করার সময় সমস্যা"
+
+#: ../DistUpgrade/DistUpgradeControler.py:348
+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:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
+msgid "Checking package manager"
+msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ"
+
+#: ../DistUpgrade/DistUpgradeControler.py:380
+msgid "Updating repository information"
+msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে"
+
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:400
+#, python-format
+msgid ""
+"After your package information was updated the essential package '%s' can "
+"not be found anymore.\n"
+"This indicates a serious error, please report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:410
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:414
+msgid "Upgrading"
+msgstr "আপগ্রেড করা হচ্ছে"
+
+#: ../DistUpgrade/DistUpgradeControler.py:421
+msgid "Searching for obsolete software"
+msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে"
+
+#: ../DistUpgrade/DistUpgradeControler.py:426
+msgid "System upgrade is complete."
+msgstr "সিস্টেম আপগ্রেড সম্পন্ন।"
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+msgid "Download is complete"
+msgstr "ডাউনলোড সম্পন্ন"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#, python-format
+msgid "Downloading file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
+#, python-format
+msgid "%s remaining"
+msgstr "%s বাকি আছে"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
+#, python-format
+msgid "Downloading file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
+msgid "Applying changes"
+msgstr "পরিবর্তনগুলো প্রয়োগ করছি"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#, python-format
+msgid "Could not install '%s'"
+msgstr "'%s' ইন্সটল করা যায় নি"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
+msgid "The upgrade aborts now. Please report this bug."
+msgstr "আপগ্রেডটি নিস্ফল ভাবে বের হয়ে যাচ্ছ। অনুগ্রহ করে এই বাগটি রিপোর্ট করুন।"
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+"কনফিগারেশন ফাইল '%s'\n"
+"কি সরানো হবে?"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
+msgid "The 'diff' command was not found"
+msgstr "'diff' কমান্ডটি পাওয়া যায় নি"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
+msgid "A fatal error occured"
+msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+msgid ""
+"Please report this as a bug and include the files /var/log/dist-upgrade.log "
+"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
+#, python-format
+msgid "%s package is going to be removed."
+msgid_plural "%s packages are going to be removed."
+msgstr[0] "%s টি প্যাকেজ মোছা হবে।"
+msgstr[1] "%s টি প্যাকেজ মোছা হবে।"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
+#, python-format
+msgid "%s new package is going to be installed."
+msgid_plural "%s new packages are going to be installed."
+msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।"
+msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
+#, python-format
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।"
+msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
+#, python-format
+msgid "You have to download a total of %s."
+msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
+msgid "To prevent data loss close all open applications and documents."
+msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।"
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
+msgid "Could not find any upgrades"
+msgstr "কোন আপগ্রেড পাওয়া যায় নি"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+msgid "Your system has already been upgraded."
+msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr "<b>%s মুছো</b>"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
+#, python-format
+msgid "Install %s"
+msgstr "%s ইন্সটল"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#, python-format
+msgid "Upgrade %s"
+msgstr "%s আপগ্রেড"
+
+#: ../DistUpgrade/DistUpgradeView.py:75
+msgid "Reboot required"
+msgstr "রিবুট করা প্রয়োজন"
+
+#: ../DistUpgrade/DistUpgradeView.py:76
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?"
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid ""
+"<b><big>Cancel the running upgrade?</big></b>\n"
+"\n"
+"The system could be in an unusable state if you cancel the upgrade. You are "
+"strongly adviced to resume the upgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr "<b><big>আপগ্রেড সম্পন্ন করতে সিস্টেমটি রিস্টার্ট করুন</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
+"span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড করছি</"
+"span>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr "পরিস্কার করছি"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr "বিস্তারিত"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr "ফাইলগুলোর মধ্যে পার্থক্য"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Downloading and installing the upgrades"
+msgstr "আপগ্রেড ডাউনলোড এবং ইন্সটল করা হচ্ছে"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr "সফ্টওয়্যার চ্যানেল পরিবর্তন করা হচ্ছ"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr "আপগ্রেড প্রস্তুত করা হচ্ছে"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr "সিস্টেমটি রিস্টার্ট করছি"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr "টার্মিন্যাল"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "Upgrading Ubuntu"
+msgstr "উবুন্টু আপগ্রেড করছি"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Keep"
+msgstr "রাখো (_K)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr "প্রতিস্হাপন (_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr "বাগ রিপোর্ট (_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr "এক্ষুনি রিস্টার্ট (_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Resume Upgrade"
+msgstr "পুনরায় আপগ্রেড শুরু (_R)"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr "রিলিজ নোট পাওয়া যায় নি"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr "সার্ভারটি মনে হয় ব্যস্ত। "
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr "রিলিজ নোট ডাউনলোড করা যায় নি"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:151
+msgid "Could not run the upgrade tool"
+msgstr "আপগ্রেড টুলটি চালানো যায় নি"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:152
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr "এটি মনে হচ্ছে আপগ্রেড টুলের একটি বাগ। অনুগ্রহ করে বাগটি রিপোর্ট করুন"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "Downloading the upgrade tool"
+msgstr "আপগ্রেড টুল ডাউনলোড করছি"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:175
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr "আপগ্রেড টুলটি আপনাকে আপগ্রেড প্রক্রিয়ায় সাহায্য করবে।"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:182
+msgid "Upgrade tool signature"
+msgstr "আপগ্রেড টুল স্বাক্ষর"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:185
+msgid "Upgrade tool"
+msgstr "আপগ্রেড টুল"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:207
+msgid "Failed to fetch"
+msgstr "আনতে ব্যর্থ"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr "আপগ্রেডটি আনতে ব্যর্থ। নেটওয়ার্কে কোন সমস্যা থাকতে পারে। "
+
+#: ../UpdateManager/DistUpgradeFetcher.py:213
+msgid "Failed to extract"
+msgstr "এক্সট্রাক্ট করতে ব্যর্থ"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr "আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে পারে। "
+
+#: ../UpdateManager/DistUpgradeFetcher.py:220
+msgid "Verfication failed"
+msgstr "যথার্থ্যতা পরীক্ষা করতে ব্যর্থ"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid ""
+"Verfing the upgrade failed.  There may be a problem with the network or with "
+"the server. "
+msgstr ""
+"আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা "
+"থাকতে পারে। "
+
+#: ../UpdateManager/DistUpgradeFetcher.py:227
+msgid "Authentication failed"
+msgstr "অনমোদন প্রক্রিয়া ব্যর্থ"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:107
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:111
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:148
+msgid "The list of changes is not available yet. Please try again later."
+msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
+
+#: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
+msgid ""
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr ""
+"পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:184
+msgid "Cannot install all available updates"
+msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি"
+
+#: ../UpdateManager/UpdateManager.py:185
+msgid ""
+"Some updates require the removal of further software. Use the function "
+"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
+"get dist-upgrade\" in a terminal to update your system completely."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:195
+msgid "The following updates will be skipped:"
+msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:"
+
+#: ../UpdateManager/UpdateManager.py:330
+#, python-format
+msgid "Version %s: \n"
+msgstr "ভার্সন %s: \n"
+
+#: ../UpdateManager/UpdateManager.py:390
+msgid "Downloading the list of changes..."
+msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..."
+
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
+msgid "Download size: %s"
+msgstr "ডাউনলোড এর আকার: %s"
+
+#: ../UpdateManager/UpdateManager.py:432
+msgid "Your system is up-to-date"
+msgstr "আপনার সিস্টেম আপ-টু-ডেট"
+
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:458
+msgid "Hide details"
+msgstr "বিস্তারিত আড়াল"
+
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
+msgid "Show details"
+msgstr "বিস্তারিত প্রদর্শন"
+
+#: ../UpdateManager/UpdateManager.py:475
+msgid "Please wait, this can take some time."
+msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
+
+#: ../UpdateManager/UpdateManager.py:477
+msgid "Update is complete"
+msgstr "আপডেট সম্পন্ন"
+
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
+msgid "New version: %s   (Size: %s)"
+msgstr "নতুন ভার্সন: %s (আকার: %s)"
+
+#: ../UpdateManager/UpdateManager.py:594
+msgid "Your distribution is not supported anymore"
+msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়"
+
+#: ../UpdateManager/UpdateManager.py:595
+msgid ""
+"You will not get any further security fixes or critical updates. Upgrade to "
+"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
+"information on upgrading."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:646
+msgid "Only one software management tool is allowed to run at the same time"
+msgstr "শুধুমাত্র একটি সফ্টওয়্যার ম্যানেজমেন্ট টুল একসময়ে চালানো যাবে"
+
+#: ../UpdateManager/UpdateManager.py:648
+msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
+msgstr ""
+"অনুগ্রহ করে অন্যান্য অ্যাপলিকেশন যেমন, 'aptitude' অথবা 'Synaptic' প্রথমে বন্ধ করুন।"
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:665
+msgid "Software index is broken"
+msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid ""
+"It is impossible to install or remove any software. Please use the package "
+"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
+"this issue at first."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:1
+msgid ""
+"<b><big>You must check for updates manually</big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Examining your system</b></big>\n"
+"\n"
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr "<big><b>আপনার সিস্টেম আপ-টু-ডেট রাখুন</b></big>"
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr "ডাউনলোড বাতিল (_D)"
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr "পরিবর্তন"
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Chec_k"
+msgstr "পরীক্ষা করো (_k)"
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Check the software channels for new updates"
+msgstr "নতুন আপডেট এর জন্য সফ্টওয়্যার চ্যানেল পরীক্ষা করো"
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Description"
+msgstr "বর্ননা"
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr "রিলিজ নোট"
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr "একটি ফাইলের অগ্রগতি দেখাও"
+
+#: ../data/UpdateManager.glade.h:16
+msgid "Software Updates"
+msgstr "সফ্টওয়্যার আপডেট"
+
+#: ../data/UpdateManager.glade.h:17
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:18
+msgid "U_pgrade"
+msgstr "আপগ্রেড (_p)"
+
+#: ../data/UpdateManager.glade.h:19
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো"
+
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr "পরীক্ষা করো (_C)"
+
+#: ../data/UpdateManager.glade.h:21
+msgid "_Hide this information in the future"
+msgstr "ভবিষ্যতে এই তথ্য আড়াল রাখো (_H)"
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
+msgstr "আপডেট ইন্সটল করো (_I)"
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr "<b>চ্যানেল</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr "<b>ইন্টারনেট আপডেট</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>কী</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr "সিডিরম যোগ (_C)"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "প্রমাণীকরন"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr "ডাউনলোড করা সফ্টওয়্যার ফাইল মুছো (_e):"
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr "বিশ্বস্ত সফ্টওয়্যার প্রদানকারীর থেকে পাবলিক কী ইমপোর্ট করো"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "ইন্সটলেশন মাধ্যম"
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr "ইন্টারনেট আপডেট"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr "ডিফল্ট পুনঃস্হাপন (_D)"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr "আপনার ডিস্ট্রিবিউশনের ডিফল্ট কী পুনঃস্হাপন করুন"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "সফ্টওয়্যার অগ্রাধিকার"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr "স্বয়ংক্রিয় ভাবে আপডেট পরীক্ষা করো (_C):"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the background, but do not install them"
+msgstr "আড়ালে আপডেট ডাউনলোড করো, কিন্তু তাদেরকে ইন্সটল করো না (_D)"
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr "নিরাপত্তা জনিত আপডেট গুলো অনুমদন ছাড়াই ইন্সটল করো (_I)"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid "     "
+msgstr "     "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+msgid ""
+"<b><big>The channel information is out-of-date</big></b>\n"
+"\n"
+"You have to reload the channel information to install software and updates "
+"from newly added or changed channels. \n"
+"\n"
+"You need a working internet connection to continue."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Channel</b>"
+msgstr "<b>চ্যানেল</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Components</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line includes the type, location and components of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "APT line:"
+msgstr "APT লাইন:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "Add Channel"
+msgstr "চ্যানেল যোগ"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"বাইনারী\n"
+"উৎস"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
+msgid "Edit Channel"
+msgstr "চ্যানেন সম্পাদন"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
+msgid "Scanning CD-ROM"
+msgstr "সিডিরম স্ক্যান করা হচ্ছে"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
+#, fuzzy
+msgid "_Add Channel"
+msgstr "চ্যানেল যোগ (_A)"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
+msgid "_Custom"
+msgstr "নিজ হাতে (_C)"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr "পুনরায় পড়ো (_R)"
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr "উপস্হিত আপডেট গুলো প্রদর্শন এবং ইন্সটল করো"
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr "আপডেট ম্যানেজার"
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr "নতুন ডিস্ট্রিবিউশন রিলিজের জন্য পরীক্ষা করো"
+
+#: ../data/update-manager.schemas.in.h:3
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr "চ্যানেল তালিকা পুনরায় পড়ার কথা মনে করো"
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr "একটি আপডেটের বিস্তারিত প্রদর্শন করো"
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr "update-manager ডায়ালগের আকার সংরক্ষন"
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr "উইনডোর আকার"
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure software channels and internet updates"
+msgstr "সফ্টওয়্যার চ্যানেল এবং ইন্টারনেট আপডেট কনফিগার"
+
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Properties"
+msgstr "সফ্টওয়্যার বৈশিষ্ট্য"
+
+#. ChangelogURI
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+
+#. Description
+#: ../channels/Ubuntu.info.in:6
+msgid "Ubuntu 6.06 'Dapper Drake'"
+msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
+
+#. Description
+#: ../channels/Ubuntu.info.in:23
+msgid "Ubuntu 6.06 Security Updates"
+msgstr "উবুন্টু ৬.০৬ নিরাপত্তামুলক আপডেট"
+
+#. Description
+#: ../channels/Ubuntu.info.in:40
+msgid "Ubuntu 6.06 Updates"
+msgstr "উবুন্টু ৬.০৬ আপডেট"
+
+#. Description
+#: ../channels/Ubuntu.info.in:57
+msgid "Ubuntu 6.06 Backports"
+msgstr "উবুন্টু ৬.০৬ ব্যাকপোর্ট"
+
+#. Description
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
+
+#. Description
+#: ../channels/Ubuntu.info.in:108
+msgid "Ubuntu 5.10 Updates"
+msgstr "উবুন্টু ৫.১০ আপডেট"
+
+#. Description
+#: ../channels/Ubuntu.info.in:125
+msgid "Ubuntu 5.10 Backports"
+msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr "অফিসিয়াল ভাবে সমর্থিত"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:131
+msgid "Restricted copyright"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:134
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:137
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. ChangelogURI
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+
+#. Description
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr "ডেবিয়ান ৩.১ \"সার্জ\""
+
+#. BaseURI
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr "http://security.debian.org/"
+
+#. Description
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr "ডেবিয়ান ৩.১ \"Sarge\" নিরাপত্তামুলক আপডেট"
+
+#. Description
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr "ডেবিয়ান \"Etch\" (testing)"
+
+#. BaseURI
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr "http://http.us.debian.org/debian/"
+
+#. Description
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr "ডেবিয়ান \"Sid\" (unstable)"
+
+#. CompDescription
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/br.po b/po/br.po
index 7a1fd63d..1aa0bf01 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,44 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:18+0000\n"
-"Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-27 10:09+0000\n"
+"Last-Translator: Oublieuse <oublieuse@gmail.com>\n"
 "Language-Team: Breton <br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
+msgstr "Bep %s devezh"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
 msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "War-lerc'h %s devezh"
 
 #: ../SoftwareProperties/SoftwareProperties.py:422
 msgid "Import key"
-msgstr ""
+msgstr "Emborzhiañ an alc'hwezh"
 
 #: ../SoftwareProperties/SoftwareProperties.py:432
 msgid "Error importing selected file"
-msgstr ""
+msgstr "Fazi en ur emborzhiañ ar restr dibabet"
 
 #: ../SoftwareProperties/SoftwareProperties.py:433
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
+"Moarvat n'eo ket ur restr alc'hwezh GPG ar restr dibabet, pe neuze eo "
+"gwastet."
 
 #: ../SoftwareProperties/SoftwareProperties.py:445
 msgid "Error removing the key"
-msgstr ""
+msgstr "Fazi en ur zilemel an alc'hwezh"
 
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
+"N'eus ket tu da zilemel an alc'whezh ho peus dibabet. Kelaouit eo ur bug "
+"marplij."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -57,15 +89,15 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:544
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Roit un anv evit ar bladenn marplij"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Lakait ur bladenn e-barzh ul lenner marplij:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "Pakadoù torr"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
@@ -133,41 +165,72 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -175,47 +238,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,20 +286,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -244,44 +307,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -289,97 +352,97 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -576,7 +639,8 @@ msgstr ""
 
 #: ../UpdateManager/UpdateManager.py:153
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 
 #. print "WARNING, keeping packages"
@@ -595,88 +659,78 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -693,10 +747,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -737,8 +791,8 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -800,8 +854,7 @@ msgstr ""
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -875,7 +928,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 00000000..58d25763
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,1482 @@
+# Catalan translation for update-manager
+# Copyright (C) 2006
+# This file is distributed under the same license as the update-manager package.
+# Jordi Irazuzta Cardús <irazuzta@gmail.com>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 19:29+0000\n"
+"Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n"
+"Language-Team: Catalan <tradgnome@softcatala.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:111
+#, python-format
+msgid "Every %s days"
+msgstr "Cada %s dies"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:141
+#, python-format
+msgid "After %s days"
+msgstr "Després de %s dies"
+
+#: ../SoftwareProperties/SoftwareProperties.py:422
+msgid "Import key"
+msgstr "Importa un clau"
+
+#: ../SoftwareProperties/SoftwareProperties.py:432
+msgid "Error importing selected file"
+msgstr "S'ha produït un error en importar el fitxer seleccionat"
+
+#: ../SoftwareProperties/SoftwareProperties.py:433
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+"El fitxer que heu seleccionat no correspon a una clau GPG o pot estar "
+"corromput."
+
+#: ../SoftwareProperties/SoftwareProperties.py:445
+msgid "Error removing the key"
+msgstr "S'ha produït un error en esborrar la clau"
+
+#: ../SoftwareProperties/SoftwareProperties.py:446
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+"La clau que heu seleccionat no es pot esborrar. Notifiqueu-ho com a error de "
+"programació."
+
+#: ../SoftwareProperties/SoftwareProperties.py:487
+#, python-format
+msgid ""
+"<big><b>Error scaning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+"<big><b>S'ha produït un error en llegir el CD</b></big>\n"
+"\n"
+"%s"
+
+#: ../SoftwareProperties/SoftwareProperties.py:544
+msgid "Please enter a name for the disc"
+msgstr "Introduïu un nom per al disc"
+
+#: ../SoftwareProperties/SoftwareProperties.py:560
+msgid "Please insert a disc in the drive:"
+msgstr "Inseriu un disc a la unitat:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+msgid "Broken packages"
+msgstr "Paquets trencats"
+
+#: ../DistUpgrade/DistUpgradeCache.py:93
+msgid ""
+"Your system contains broken packages that couldn't be fixed with this "
+"software. Please fix them first using synaptic or apt-get before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:135
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:142
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:145
+msgid "Could not calculate the upgrade"
+msgstr "No s'ha pogut calcular l'actualització"
+
+#: ../DistUpgrade/DistUpgradeCache.py:146
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:169
+msgid "Error authenticating some packages"
+msgstr "S'ha produït un error en autenticar alguns paquets"
+
+#: ../DistUpgrade/DistUpgradeCache.py:170
+msgid ""
+"It was not possible to authenticate some packages. This may be a transient "
+"network problem. You may want to try again later. See below for a list of "
+"unauthenticated packages."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:233
+#, python-format
+msgid "Can't install '%s'"
+msgstr "No s'ha pogut instal·lar '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:234
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:241
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:242
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr "S'està llegint la memòria cau"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
+msgid "Repository information invalid"
+msgstr "La informació del dipòsit no és vàlida"
+
+#: ../DistUpgrade/DistUpgradeControler.py:180
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
+msgid "Error during update"
+msgstr "S'ha produït un error en l'actualització"
+
+#: ../DistUpgrade/DistUpgradeControler.py:234
+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:253
+msgid "Not enough free disk space"
+msgstr "No disposeu de suficient espai al disc"
+
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#, python-format
+msgid ""
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:260
+msgid "Do you want to start the upgrade?"
+msgstr "Voleu iniciar l'actualització?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:277
+msgid "Could not install the upgrades"
+msgstr "No s'han pogut instal·lar les actualitzacions"
+
+#: ../DistUpgrade/DistUpgradeControler.py:278
+msgid ""
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"was run (dpkg --configure -a)."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "Could not download the upgrades"
+msgstr "No s'han pogut descarregar les actualitzacions"
+
+#: ../DistUpgrade/DistUpgradeControler.py:294
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:336
+msgid "Remove obsolete packages?"
+msgstr "Voleu esborrar els paquets obsolets?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:337
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:337
+msgid "_Remove"
+msgstr "Esbo_rra"
+
+#: ../DistUpgrade/DistUpgradeControler.py:347
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:348
+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:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
+msgid "Checking package manager"
+msgstr "S'està comprovant el gestor de paquets"
+
+#: ../DistUpgrade/DistUpgradeControler.py:380
+msgid "Updating repository information"
+msgstr "S'està actualitzant la informació del dipòsit"
+
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:400
+#, python-format
+msgid ""
+"After your package information was updated the essential package '%s' can "
+"not be found anymore.\n"
+"This indicates a serious error, please report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:410
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:414
+msgid "Upgrading"
+msgstr "Actualitzant"
+
+#: ../DistUpgrade/DistUpgradeControler.py:421
+msgid "Searching for obsolete software"
+msgstr "S'està cercant programari obsolet"
+
+#: ../DistUpgrade/DistUpgradeControler.py:426
+msgid "System upgrade is complete."
+msgstr "S'ha completat l'actualització del sistema"
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr "Inseriu '%s' a la unitat '%s'"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+msgid "Download is complete"
+msgstr "S'ha completat la descàrrega"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#, python-format
+msgid "Downloading file %li of %li at %s/s"
+msgstr "S'està descarregant el fitxer %li de %li a %s/s"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
+#, python-format
+msgid "Downloading file %li of %li"
+msgstr "S'està descarregant el fitxer %li de %li"
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
+msgid "Applying changes"
+msgstr "S'estan aplicant els canvis"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#, python-format
+msgid "Could not install '%s'"
+msgstr "No s'ha pogut instal·lar '%s'"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
+msgid "The upgrade aborts now. Please report this bug."
+msgstr "L'actualització s'ha cancel·lat. Informeu d'aquest error"
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+"Voleu reemplaçar el fitxer de\n"
+"configuració '%s'?"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
+msgid "The 'diff' command was not found"
+msgstr "No s'ha trobat l'ordre 'diff0'"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
+msgid "A fatal error occured"
+msgstr "S'ha produït un error greu"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+msgid ""
+"Please report this as a bug and include the files /var/log/dist-upgrade.log "
+"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
+#, python-format
+msgid "%s package is going to be removed."
+msgid_plural "%s packages are going to be removed."
+msgstr[0] "S'esborrarà %s paquet"
+msgstr[1] "S'esborraran %s paquets"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
+#, python-format
+msgid "%s new package is going to be installed."
+msgid_plural "%s new packages are going to be installed."
+msgstr[0] "S'instal·larà %s paquet"
+msgstr[1] "S'instal·laran %s paquets"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
+#, python-format
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] "S'actualitzarà %s paquet"
+msgstr[1] "S'actualitzaran %s paquets"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
+msgid "Could not find any upgrades"
+msgstr "No s'han pogut trobar actualitzacions"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+msgid "Your system has already been upgraded."
+msgstr "El vostre sistema ja està actualitzat"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr "<b>Esborra %s</b>"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
+#, python-format
+msgid "Install %s"
+msgstr "Instal·la %s"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#, python-format
+msgid "Upgrade %s"
+msgstr "Actualitza %s"
+
+#: ../DistUpgrade/DistUpgradeView.py:75
+msgid "Reboot required"
+msgstr "És necessari que reinicieu el sistema"
+
+#: ../DistUpgrade/DistUpgradeView.py:76
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid ""
+"<b><big>Cancel the running upgrade?</big></b>\n"
+"\n"
+"The system could be in an unusable state if you cancel the upgrade. You are "
+"strongly adviced to resume the upgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr "<b><big>Reinicieu el sistema per a completar l'actualització</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr "<b><big>Voleu iniciar l'actualització?</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
+"span>"
+msgstr ""
+"<span weight=\"bold\" size=\"x-large\">S'està actualitzant a Ubuntu \"Dapper"
+"\" 6.06</span>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr "Detalls"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr "Diferències entre els fitxers"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Downloading and installing the upgrades"
+msgstr "S'estan descarregant i instal·lant les actualitzacions"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr "S'estan modificant els canals de programari"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr "S'està preparant l'actualització"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr "S'està reiniciant el sistema"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr "Terminal"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "Upgrading Ubuntu"
+msgstr "S'està actualitzant Ubuntu"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr "_Reemplaça"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr "_Informa de l'error"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr "_Reinicia"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr "No s'han pogut trobar les notes de la versió"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr "El servidor potser està sobrecarregat. "
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr "No s'han pogut descarregar les notes de la versió"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr "Comproveu la vostra connexió a Internet"
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:151
+msgid "Could not run the upgrade tool"
+msgstr "No es pot executar l'eina d'actualització"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:152
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "Downloading the upgrade tool"
+msgstr "S'està descarregant l'eina d'actualització"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:175
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:182
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:185
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:207
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:213
+msgid "Failed to extract"
+msgstr "Ha fallat l'extracció"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:220
+msgid "Verfication failed"
+msgstr "Ha fallat la verificació"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid ""
+"Verfing the upgrade failed.  There may be a problem with the network or with "
+"the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:227
+msgid "Authentication failed"
+msgstr "Ha fallat l'autenticació"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:107
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
+
+#: ../UpdateManager/GtkProgress.py:111
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
+
+#: ../UpdateManager/UpdateManager.py:148
+msgid "The list of changes is not available yet. Please try again later."
+msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
+
+#: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
+msgid ""
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr ""
+"S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió "
+"a Internet."
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:184
+msgid "Cannot install all available updates"
+msgstr "No es poden instal·lar les actualitzacions disponibles"
+
+#: ../UpdateManager/UpdateManager.py:185
+msgid ""
+"Some updates require the removal of further software. Use the function "
+"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
+"get dist-upgrade\" in a terminal to update your system completely."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:195
+msgid "The following updates will be skipped:"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:330
+#, python-format
+msgid "Version %s: \n"
+msgstr "Versió %s: \n"
+
+#: ../UpdateManager/UpdateManager.py:390
+msgid "Downloading the list of changes..."
+msgstr "S'està descarregant la llista de canvis..."
+
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
+msgid "Download size: %s"
+msgstr "Mida de la descàrrega: %s"
+
+#: ../UpdateManager/UpdateManager.py:432
+msgid "Your system is up-to-date"
+msgstr "El vostre sistema està actualitzat"
+
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:458
+msgid "Hide details"
+msgstr "Amaga els detalls"
+
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
+msgid "Show details"
+msgstr "Mostra els detalls"
+
+#: ../UpdateManager/UpdateManager.py:475
+msgid "Please wait, this can take some time."
+msgstr "Espereu, això pot tardar una estona."
+
+#: ../UpdateManager/UpdateManager.py:477
+msgid "Update is complete"
+msgstr "S'ha completat l'actualització"
+
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
+msgid "New version: %s   (Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:594
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:595
+msgid ""
+"You will not get any further security fixes or critical updates. Upgrade to "
+"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
+"information on upgrading."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:646
+msgid "Only one software management tool is allowed to run at the same time"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:648
+msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
+msgstr ""
+"Abans heu de tancar l'altre gestor de paquets, p. ex. l'Aptitude o el "
+"Synaptic"
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:665
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid ""
+"It is impossible to install or remove any software. Please use the package "
+"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
+"this issue at first."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:1
+msgid ""
+"<b><big>You must check for updates manually</big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Examining your system</b></big>\n"
+"\n"
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr "<big><b>Manteniu el vostre sistema actualitzat</b></big>"
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr "Cancel·la la _descàrrega"
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr "Canvis"
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Chec_k"
+msgstr "Compro_va"
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Description"
+msgstr "Descripció"
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr "Notes de la versió"
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr "Mostra el progrés per als fitxers individuals"
+
+#: ../data/UpdateManager.glade.h:16
+msgid "Software Updates"
+msgstr "Actualitzacions del programari"
+
+#: ../data/UpdateManager.glade.h:17
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:18
+msgid "U_pgrade"
+msgstr "_Actualitza"
+
+#: ../data/UpdateManager.glade.h:19
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr "_Comprova"
+
+#: ../data/UpdateManager.glade.h:21
+msgid "_Hide this information in the future"
+msgstr "_En el futur oculta aquesta informació"
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
+msgstr "_Instal·la les actualitzacions"
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr "<b>Canals</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualitzacions d'Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Claus</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr "Afegeix un _CD-ROM"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autenticació"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Mitjà d'instal·lació"
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr "Actualitzacions d'Internet"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr "Restaura els valors per _defecte"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr "Restaura les claus per defecte de la vostra distribució"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferències del programari"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr "_Comprova les actualitzacions automàticament"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the background, but do not install them"
+msgstr "_Descarrega les actualitzacions en segon pla, però no les instal·lis"
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr "_Instal·la actualitzacions de seguretat sense confirmació"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid "     "
+msgstr "     "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+msgid ""
+"<b><big>The channel information is out-of-date</big></b>\n"
+"\n"
+"You have to reload the channel information to install software and updates "
+"from newly added or changed channels. \n"
+"\n"
+"You need a working internet connection to continue."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Channel</b>"
+msgstr "<b>Canal</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Comment:</b>"
+msgstr "<b>Comentari:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Components:</b>"
+msgstr "<b>Components:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Components</b>"
+msgstr "<b>Components</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
+msgid "<b>Distribution:</b>"
+msgstr "<b>Distribució:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "<b>Type:</b>"
+msgstr "<b>Tipus:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line includes the type, location and components of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "APT line:"
+msgstr "Línia APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "Add Channel"
+msgstr "Afegeix un canal"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binari\n"
+"Font"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
+msgid "Scanning CD-ROM"
+msgstr "S'està analitzant el CD-ROM"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
+msgid "_Custom"
+msgstr "_Personalitza"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr "Act_ualitza"
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr "Mostra i instal·la les actualitzacions disponibles"
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr "Gestor d'actualitzacions"
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr "Mostra els detalls d'una actualització"
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr "La mida de la finestra"
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure software channels and internet updates"
+msgstr "Configura els canals de programari i les actualitzacions d'Internet"
+
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Properties"
+msgstr "Propietats del programari"
+
+#. ChangelogURI
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+
+#. Description
+#: ../channels/Ubuntu.info.in:6
+msgid "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 'Dapper Drake'"
+
+#. Description
+#: ../channels/Ubuntu.info.in:23
+msgid "Ubuntu 6.06 Security Updates"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:40
+msgid "Ubuntu 6.06 Updates"
+msgstr "Actualitzacions d'Ubuntu 6.06"
+
+#. Description
+#: ../channels/Ubuntu.info.in:57
+msgid "Ubuntu 6.06 Backports"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Actualitzacions de seguretat d'Ubuntu 5.10"
+
+#. Description
+#: ../channels/Ubuntu.info.in:108
+msgid "Ubuntu 5.10 Updates"
+msgstr "Actualitzacions d'Ubuntu 5.10"
+
+#. Description
+#: ../channels/Ubuntu.info.in:125
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr "Paquets mantinguts oficialment"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:131
+msgid "Restricted copyright"
+msgstr "Paquets amb restriccions per copyright"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:134
+msgid "Community maintained (Universe)"
+msgstr "Paquets mantinguts per la comunitat (Universe)"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:137
+msgid "Non-free (Multiverse)"
+msgstr "Paquets sense llicència lliure (Multiverse)"
+
+#. ChangelogURI
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+
+#. Description
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 \"Sarge\""
+
+#. BaseURI
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr "http://security.debian.org/"
+
+#. Description
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. 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 "http://http.us.debian.org/debian/"
+
+#. 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 ""
+
+#~ msgid "Edit software sources and settings"
+#~ msgstr "Edita les fonts i els paràmetres del programari"
+
+#~ msgid "<b>Internet Updates</b>"
+#~ msgstr "<b>Actualitzacions d'Internet</b>"
+
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Fonts</b>"
+
+#~ msgid "Check for updates every"
+#~ msgstr "Comprova les actualitzacions cada"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "Restaura els valors per defecte"
+
+#~ msgid "day(s)"
+#~ msgstr "dies"
+
+#~ msgid "<b>Repository</b>"
+#~ msgstr "<b>Dipòsit</b>"
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Seccions:</b>"
+
+#~ msgid "<b>Temporary files</b>"
+#~ msgstr "<b>Fitxers temporals</b>"
+
+#~ msgid "<b>User Interface</b>"
+#~ msgstr "<b>Interfície d'usuari</b>"
+
+#~ msgid ""
+#~ "<big><b>Authentication keys</b></big>\n"
+#~ "\n"
+#~ "You can add and remove authentication keys in this dialog. A key makes it "
+#~ "possible to verify the integrity of the software you download."
+#~ msgstr ""
+#~ "<big><b>Claus d'autenticació</b></big>\n"
+#~ "\n"
+#~ "Des d'aquest quadre de diàleg podeu afegir i esborrar claus "
+#~ "d'autenticació. Les claus permeten comprovar la integritat del programari "
+#~ "que descarregueu."
+
+#~ msgid ""
+#~ "<big><b>Enter the complete APT line of the repository that you want to "
+#~ "add</b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and content of a repository, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+#~ "detailed description of the syntax in the documentation."
+#~ msgstr ""
+#~ "<big><b>Introduïu la línia APT del dipòsit que voleu afegir</b></big>\n"
+#~ "\n"
+#~ "La línia APT conté el tipus, la ubicació i el contingut del dipòsit; per "
+#~ "exemple, <i>\"deb http://ftp.debian.org sarge main\"</i>. Podeu trobar "
+#~ "una descripció més detallada de la sintaxi en la documentació."
+
+#~ msgid ""
+#~ "Add a new key file to the trusted keyring. Make sure that you received "
+#~ "the key over a secure channel and that you trust the owner."
+#~ msgstr ""
+#~ "Afegeix una clau nova a l'anell de confiança. Assegureu-vos que heu rebut "
+#~ "la clau per un canal segur i que confieu en el propietari."
+
+#~ msgid "Add repository..."
+#~ msgstr "Afegeix un dipòsit..."
+
+#~ msgid "Automatically check for software _updates."
+#~ msgstr "Comprovació automàtica de les act_ualitzacions del programari."
+
+#~ msgid "Automatically clean _temporary packages files"
+#~ msgstr "Neteja automàtica dels paquets _temporals."
+
+#~ msgid "Clean interval in days:"
+#~ msgstr "Interval de neteja en dies:"
+
+#~ msgid "Delete _old packages in the package cache"
+#~ msgstr "Esb_orra els paquets antics de la memòria cau"
+
+#~ msgid "Edit Repository..."
+#~ msgstr "Edita el dipòsit..."
+
+#~ msgid "Maximum age in days:"
+#~ msgstr "Antiguitat màxima en dies:"
+
+#~ msgid "Maximum size in MB:"
+#~ msgstr "Mida màxima en MB:"
+
+#~ msgid "Remove the selected key from the trusted keyring."
+#~ msgstr "Esborra la clau seleccionada de l'anell de confiança."
+
+#~ msgid "Restore default keys"
+#~ msgstr "Restaura les claus per defecte"
+
+#~ msgid ""
+#~ "Restore the default keys shipped with the distribution. This will not "
+#~ "change user installed keys."
+#~ msgstr ""
+#~ "Restaura les claus per defecte de la distribució. Això no afecta les "
+#~ "claus instal·lades per l'usuari."
+
+#~ msgid "Set _maximum size for the package cache"
+#~ msgstr "Fixa la mida _màxima de memòria cau per als paquets descarregats"
+
+#~ msgid "Settings"
+#~ msgstr "Paràmetres"
+
+#~ msgid "Show detailed package versions"
+#~ msgstr "Mostra les versions dels paquets detallades"
+
+#~ msgid "Show disabled software sources"
+#~ msgstr "Mostra les fonts del programari desactivades"
+
+#~ msgid "Update interval in days:"
+#~ msgstr "Interval d'actualització en dies:"
+
+#~ msgid "_Add Repository"
+#~ msgstr "_Afegeix el dipòsit"
+
+#~ msgid "_Download upgradable packages"
+#~ msgstr "_Descarrega els fitxers actualitzables"
+
+#~ msgid "<b>Details</b>"
+#~ msgstr "<b>Detalls</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Estat:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Actualitzacions disponibles</b></big>\n"
+#~ "\n"
+#~ "Els paquets següents es poden actualitzar. Per a fer-ho premeu el botó "
+#~ "Instal·la."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">S'estan descarregant els canvis</"
+#~ "span>\n"
+#~ "\n"
+#~ "Es necessita obtenir els canvis des del servidor central"
+
+#~ msgid "Cancel downloading the changelog"
+#~ msgstr "Cancel·la la descàrrega del registre de canvis"
+
+#~ msgid "Downloading Changes"
+#~ msgstr "S'estan descarregant els canvis"
+
+#~ msgid "Reload"
+#~ msgstr "Actualitza"
+
+#~ msgid "Reload the package information from the server."
+#~ msgstr "Actualitza la informació dels paquets des del servidor."
+
+#~ msgid "_Install"
+#~ msgstr "_Instal·la"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Mostra les actualitzacions disponibles i tria quina instal·lar"
+
+#~ msgid "You need to be root to run this program"
+#~ msgstr ""
+#~ "Necessiteu privilegis d'administrador per a poder executar aquest programa"
+
+#~ msgid "Binary"
+#~ msgstr "Binari"
+
+#~ msgid "Source"
+#~ msgstr "Font"
+
+#~ msgid "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+#~ msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
+
+#~ msgid "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\""
+#~ msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#~ msgid "Ubuntu 4.10 Security Updates"
+#~ msgstr "Actualitzacions de seguretat d'Ubuntu 4.10"
+
+#~ msgid "Ubuntu 4.10 Updates"
+#~ msgstr "Actualitzacions d'Ubuntu 4.10"
+
+#~ msgid "Ubuntu 5.04 Security Updates"
+#~ msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
+
+#~ msgid "Ubuntu 5.04 Updates"
+#~ msgstr "Actualitzacions d'Ubuntu 5.04"
+
+#~ msgid "Contributed software"
+#~ msgstr "Programari de la comunitat"
+
+#~ msgid "Non-free software"
+#~ msgstr "Programari sense llicència lliure"
+
+#~ msgid "US export restricted software"
+#~ msgstr "Programari amb restriccions d'exportació als EUA"
+
+#~ msgid "Debian 3.0 \"Woody\""
+#~ msgstr "Debian 3.0 \"Woody\""
+
+#~ msgid "Debian Stable Security Updates"
+#~ msgstr "Debian Stable Security Updates"
+
+#~ msgid "Debian Stable"
+#~ msgstr "Debian Stable"
+
+#~ msgid "Debian Testing"
+#~ msgstr "Debian Testing"
+
+#~ msgid "Debian Unstable \"Sid\""
+#~ msgstr "Debian Unstable \"Sid\""
+
+#~ msgid "Debian Non-US (Stable)"
+#~ msgstr "Debian Non-US (Stable)"
+
+#~ msgid "Debian Non-US (Testing)"
+#~ msgstr "Debian Non-US (Testing)"
+
+#~ msgid "Debian Non-US (Unstable)"
+#~ msgstr "Debian Non-US (Unstable)"
+
+#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+
+#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Seleccioneu un fitxer clau"
+
+#~ msgid "Your system is up-to-date!"
+#~ msgstr "El sistema està actualitzat."
+
+#~ msgid "There is one package available for updating."
+#~ msgstr "Hi ha un paquet disponible per a actualitzar."
+
+#~ msgid "There are %s packages available for updating."
+#~ msgstr "Hi ha %s paquets disponibles per a actualitzar."
+
+#~ msgid "Downloading changes..."
+#~ msgstr "S'estan descarregant els canvis..."
+
+#~ msgid "There are no updated packages"
+#~ msgstr "No hi ha paquets per a actualitzar"
+
+#~ msgid "You did not select any of the %s updated package"
+#~ msgid_plural "You did not select any of the %s updated packages"
+#~ msgstr[0] "No heu seleccionat cap paquet actualitzat"
+#~ msgstr[1] "No heu seleccionat cap dels %s paquets actualitzats"
+
+#~ msgid "You have selected %s updated package, size %s"
+#~ msgid_plural "You have selected all %s updated packages, total size %s"
+#~ msgstr[0] "Heu seleccionat %s paquet actualitzat, la mida és de $s"
+#~ msgstr[1] ""
+#~ "Heu seleccionat els %s paquets actualitzats, la mida total és de %s"
+
+#~ msgid "You have selected %s out of %s updated package, size %s"
+#~ msgid_plural ""
+#~ "You have selected %s out of %s updated packages, total size %s"
+#~ msgstr[0] "Heu seleccionat %s paquet actualitzat de %s, la mida és de $s"
+#~ msgstr[1] ""
+#~ "Heu seleccionat %s paquets actualitzats de %s, la mida total és de %s"
+
+#~ msgid "The updates are being applied."
+#~ msgstr "S'estan aplicant les actualitzacions."
+
+#~ msgid "Upgrade finished"
+#~ msgstr "S'ha finalitzat l'actualització"
+
+#~ msgid "Another package manager is running"
+#~ msgstr "S'està executant un altre gestor de paquets"
+
+#~ msgid ""
+#~ "You can run only one package management application at the same time. "
+#~ "Please close this other application first."
+#~ msgstr ""
+#~ "Només podeu executar un gestor de paquets a la vegada. Tanqueu l'altra "
+#~ "aplicació."
+
+#~ msgid "Updating package list..."
+#~ msgstr "S'està actualitzant la llista de paquets..."
+
+#~ msgid "Checking for updates..."
+#~ msgstr "S'estan comprovant les actualitzacions..."
+
+#~ msgid "Installing updates..."
+#~ msgstr "S'estan instal·lant les actualitzacions..."
+
+#~ msgid "There are no updates available."
+#~ msgstr "No hi ha actualitzacions disponibles."
+
+#~ msgid "New version:"
+#~ msgstr "Versió nova:"
+
+#~ msgid "Your distribution is no longer supported"
+#~ msgstr "La vostra distribució ja no es manté"
+
+#~ msgid ""
+#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
+#~ "running will no longer get security fixes or other critical updates. "
+#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ msgstr ""
+#~ "Actualitzeu el sistema amb una versió més nova d'Ubuntu Linux. La vostra "
+#~ "versió ja no disposarà de més actualitzacions de seguretat ni d'altres "
+#~ "actualitzacions crítiques. Si voleu més informació, visiteu http://www."
+#~ "ubuntulinux.org/."
+
+#~ msgid "There is a new release of Ubuntu available!"
+#~ msgstr "Ja disposeu del nou llançament d'Ubuntu"
+
+#~ msgid ""
+#~ "A new release with the codename '%s' is available. Please see http://www."
+#~ "ubuntulinux.org/ for upgrade instructions."
+#~ msgstr ""
+#~ "Ja disposeu del nou llançament d'Ubuntu amb el nom en clau '%s'. Si "
+#~ "necessiteu instruccions per a actualitzar el sistema, visiteu http://www."
+#~ "ubuntulinux.org/."
+
+#~ msgid "Never show this message again"
+#~ msgstr "No tornis a mostrar aquest missatge"
+
+#~ msgid "Changes not found, the server may not be updated yet."
+#~ msgstr ""
+#~ "No s'han trobat els canvis. Pot ser que el servidor encara no s'hagi "
+#~ "actualitzat."
diff --git a/po/cs.po b/po/cs.po
index 162729ad..7e7e6518 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-12 13:20+0000\n"
-"Last-Translator: Ondřej Nový <ubuntu@ondrej.org>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-01 07:39+0000\n"
+"Last-Translator: Petr Tomeš <ptomes@ubuntu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +18,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Denně"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Obden"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Týdně"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Každé dva týdny"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Každých %s dní"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Po týdnu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Po dvou týdnech"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Po měsíci"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -46,8 +74,7 @@ msgstr "Chyba při odstraňování klíče"
 
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
-"Vybraný klíč nemohl být odstraněn. Prosim nahlašte tento problém jako chybu"
+msgstr "Vybraný klíč nemohl být odstraněn. Prosím oznamte to jako chybu."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -150,23 +177,42 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Probíhá čtení cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+#, fuzzy
+msgid "No valid mirror found"
 msgstr "Nenalezena žádná platná položka"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka pro "
-"upgrade.\n"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Neplatná informace zdroje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -174,11 +220,22 @@ msgstr ""
 "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako "
 "chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Chyba během aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -186,11 +243,11 @@ msgstr ""
 "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového "
 "připojení. Prosím zkontrolujte své připojení a zkuste to znovu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Nedostatek volného místa na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -200,15 +257,15 @@ msgstr ""
 "Upgrade byl předčasně ukončen. Prosím uvolněte alespoň %s místa na disku. "
 "Vyprázdněte koš a odstraňte"
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Chcete spustit upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Nelze nainstalovat upgrady"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
@@ -217,11 +274,11 @@ msgstr ""
 "Upgrade byl předčasně ukončen. Váš systém může být v nepoužitelném stavu. "
 "Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Nelze stáhnout upgrady"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -229,24 +286,24 @@ msgstr ""
 "Upgrade byl předčasně ukončen. Prosím zkontrolujte si připojení k internetu "
 "nebo instalační médium a zkuste to znovu. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 #, fuzzy
 msgid "Remove obsolete packages?"
 msgstr "Odstranit zastaralé balíky?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Chyba při zaznamenávání"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -256,20 +313,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Kontroluje se manažer balíků"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Aktualizují se informace o úložišti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -277,44 +334,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Požaduje se potvrzení"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Probíhá upgrade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Vyhledáván zastaralý software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Upgrade systému je dokončen."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Prosím vložte '%s' do mechaniky '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Stahování bylo dokončeno"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s zbývá"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, fuzzy, python-format
 msgid "Downloading file %li of %li"
 msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
@@ -322,36 +379,36 @@ msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nelze nainstalovat '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Upgrade byl předčasně ukončen. Prosím oznamte to jako chybu"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Nastala fatální chyba"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -359,9 +416,9 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Prosím oznamte to jako chybu a do zprávy připojte soubory ~/dist-upgrade.log "
-"a ~/dist-upgrade-apt.log. Upgrade byl předčasně ukončen. "
+"a ~/dist-upgrade-apt.log. Upgrade byl předčasně ukončen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -369,7 +426,7 @@ msgstr[0] "%s balík bude odstraněn."
 msgstr[1] "%s balíky budou odstraněny."
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -377,7 +434,7 @@ msgstr[0] "%s nový balík bude nainstalován."
 msgstr[1] "%s nové balíky budou nainstalovány."
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -385,40 +442,40 @@ msgstr[0] "%s balík bude upgradován."
 msgstr[1] "%s balíky budou upgradovány."
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Bude staženo celkem %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Žádné upgrady nebyly nalezeny."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Váš systém byl již upgradován."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Odstranit %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Nainstalovat %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Upgradovat %s"
@@ -557,8 +614,7 @@ msgstr "Nelze nainstalovat upgrady"
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Při výpočtu upgradu nastal neřešitelný problém. Prosím oznamte to jako "
-"chybu. "
+"Při výpočtu upgradu nastal neřešitelný problém. Prosím oznamte to jako chybu."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -633,7 +689,8 @@ msgstr ""
 
 #: ../UpdateManager/UpdateManager.py:153
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 
 #. print "WARNING, keeping packages"
@@ -653,92 +710,82 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Zobrazit a nainstalovat dostupné aktualizace"
 msgstr[1] "Zobrazit a nainstalovat dostupné aktualizace"
 msgstr[2] "Zobrazit a nainstalovat dostupné aktualizace"
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "Zobrazit detaily"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Zobrazit detaily"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 #, fuzzy
 msgid "Update is complete"
 msgstr "Stahování bylo dokončeno"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -760,10 +807,10 @@ msgstr ""
 #: ../data/UpdateManager.glade.h:4
 #, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Zjišťují se dostupné aktualizace</b></big>\n"
 "\n"
@@ -808,9 +855,10 @@ msgid "Software Updates"
 msgstr "Aktualizace softwaru"
 
 #: ../data/UpdateManager.glade.h:17
+#, fuzzy
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Aktualizace softwaru může opravit chyby, eliminovat bezpečnostní rizika a "
 "poskytnout Vám nové možnosti."
@@ -872,10 +920,10 @@ msgid "Internet Updates"
 msgstr "Síťové aktualizace"
 
 #: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Automaticky budou nainstalovány pouze aktualizace z oficiálních serverů "
 "Ubuntu. Je tedy třeba nainstalovat i balík \"unattended-upgrades\""
@@ -956,11 +1004,12 @@ msgid "<b>URI:</b>"
 msgstr "<b>Adresa:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
+#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Zadejt kompletní APT cestu ke zdroji, který chcete přidat</b></big>\n"
@@ -1180,6 +1229,13 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Žádný DFSG kompatibilní  Software"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka "
+#~ "pro upgrade.\n"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Sekce</b>"
 
diff --git a/po/da.po b/po/da.po
index 96f9a8c9..07cdcfe8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-10 19:53+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:29+0000\n"
 "Last-Translator: Andreas Lloyd <lloydinho@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "Hver %s. dag"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, fuzzy, python-format
 msgid "Every %s days"
 msgstr "Hver %s. dag"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -37,7 +66,7 @@ msgstr "Fejl under importering af den valgte fil"
 
 #: ../SoftwareProperties/SoftwareProperties.py:433
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Den valgte fil lader ikke til at være en GPG nøglefil eller er korrupt"
+msgstr "Den valgte fil er ikke en GPG-nøglefil eller den er i stykker."
 
 #: ../SoftwareProperties/SoftwareProperties.py:445
 msgid "Error removing the key"
@@ -46,8 +75,7 @@ msgstr "Fejl ved fjernelse af nøgle"
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Den valgte nøgle kunne ikke fjernes. Rapporter venligst denne fejl som en "
-"bug."
+"Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -66,11 +94,11 @@ msgstr "Indtast venligst et navn for disken"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr "Indtast venligst en disk i drevet:"
+msgstr "Indsæt venligst en disk i drevet:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr "Ødelagt Pakke"
+msgstr "Ødelagte pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
@@ -78,21 +106,22 @@ msgid ""
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
 "Dit system indeholder ødelagte pakker som ikke kan repareres med dette "
-"program. Reparer  dem først med synaptic eller apt-get før du fortsætter."
+"program. Reparer dem venligst med synaptic eller apt-get før du fortsætter."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr "Kan ikke opgradere krævet meta-pakke"
+msgstr "Kan ikke opgradere de krævede meta-pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
+#, fuzzy
 msgid "A essential package would have to be removed"
-msgstr "En system kritisk pakke ville have blevet fjernet"
+msgstr "Det ville være nødvendigt at fjerne en system kritisk pakke"
 
 #. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 #, fuzzy
 msgid "Could not calculate the upgrade"
-msgstr "Kunne ikke beregne upgraderings tiden"
+msgstr "Kunne ikke udregne opgraderingen"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 #, fuzzy
@@ -100,25 +129,23 @@ msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Der er forkommet et uløseligt problem imens beregning af upgraderings tid. "
-"Raporter venligst denne fejl. "
+"Der er forkommet et uløseligt problem under beregning af opgraderingen. "
+"Raporter venligst dette som en fejl. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
-#, fuzzy
 msgid "Error authenticating some packages"
-msgstr "Fejl ved validering af nogle pakker"
+msgstr "Fejl ved godkendelse af nogle pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
-#, fuzzy
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
-"Det var ikke muligt at validere nogle af pakkerne. Dette kan være pga. "
-"Netværks problemer. Det anbefales du prøver igen senere. Se længere nede for "
-"en liste over pakker som ikke kunne valideres."
+"Nogle pakker kunne ikke godkendes. Det kan være et problem med netværket. "
+"Det anbefales du prøver igen senere. Se længere nede for en liste over "
+"pakker som ikke kunne godkendes."
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
@@ -126,13 +153,12 @@ msgid "Can't install '%s'"
 msgstr "Kan ikke installere '%s'"
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Det var umuligt at installere en pakke som var krævet. Venligst raporter "
-"denne hændelse som en fejl. "
+"Det var umuligt at installere en påkrævet pakke. Rapporter venligst dette "
+"som en fejl. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
@@ -148,116 +174,164 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"Dit system indeholder ikke en af pakkerne ubuntu-desktop, kubuntu-desktop "
+"eller edubuntu-desktop, og det var ikke muligt at finde ud af hvilken "
+"version af Ubuntu du kører.\n"
+" Installer venligst en af pakkerne nævnt herover ved hjælp af Synaptic eller "
+"apt-get før du fortsætter."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
+msgstr "Læser cache-mellemlager"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Arkivinformation ugyldig."
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette "
+"som en fejl."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
-msgid "Error during update"
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
+msgid "Error during update"
+msgstr "Fejl under opdatering"
+
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"En fejl forekom under opdateringen. Dette skyldes som regel et "
+"netværksproblem, tjek venligst din netværksforbindelse og prøv igen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
-msgstr "Ikke nok frit disk plads"
+msgstr "Der er ikke nok fri diskplads"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"Opgraderingen afbrydes nu. Sørg venligst for skaffe %s mere diskplads. Tøm "
+"din papirkurv og fjern midlertidige pakker fra tidligere installationer ved "
+"at køre 'sudo apt-get clean' i terminalen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Vil du starte opgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr "Kan ikke installere opgraderingerne"
+msgstr "Kunne ikke installere opgraderingerne"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr "Kan ikke hente opgraderingerne"
+msgstr "Kunne ikke hente opgraderingerne"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit "
+"installationsmedie og prøv igen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Fjern forældede pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
+#, fuzzy
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Spring dette trin over"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
-msgstr ""
+msgstr "_Fjern"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
+#, fuzzy
 msgid "Error during commit"
-msgstr ""
+msgstr "Fejl under udførsel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Et problem opstod under oprydningen. Se venligst længere nede for mere "
+"information. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
-msgstr ""
+msgstr "Undersøger pakkehåndtering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
-msgstr ""
+msgstr "Opdaterer arkivinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -265,154 +339,158 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
-msgstr ""
+msgstr "Opgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Søger efter forældet software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Systemopgradering er fuldført"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Indsæt venligst '%s' i drevet '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
-msgstr ""
+msgstr "Overførsel fuldført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
-#, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#, fuzzy, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "Henter fil %li af %li fra %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "%s tilbage"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
-msgstr ""
+msgstr "Henter fil %li af %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
-msgstr ""
+msgstr "Udfører ændringer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Kunne ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
-msgstr ""
+msgstr "Opgraderingen afbryder nu. Rapporter venligst denne fejl."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
+"Udskift opsætningsfilen\n"
+"'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Kommandoen 'diff' blev ikke fundet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
-msgstr ""
+msgstr "En alvorlig fejl opstod"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pakke vil blive fjernet."
+msgstr[1] "%s pakker vil blive fjernet."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s ny pakke vil blive installeret."
+msgstr[1] "%s nye pakker vil blive installeret."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s pakke vil blive opgraderet."
+msgstr[1] "%s pakker vil bliver opgraderet."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
-#, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
+#, fuzzy, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "Der skal i alt hentes %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
-msgstr ""
+msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "Kunne ikke finde nogen tilgængelige opgraderinger"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "Dit system er allerede opgraderet."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Fjern %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Installer %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Opgrader %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
-msgstr ""
+msgstr "Genstart af maskinen er påkrævet"
 
 #: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Opgraderingen er afsluttet og et genstart af maskinen er påkrævet. Vil du "
+"gøre dette nu?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -430,188 +508,200 @@ msgid ""
 "The system could be in an unusable state if you cancel the upgrade. You are "
 "strongly adviced to resume the upgrade."
 msgstr ""
+"<b><big>Afbryd den igangværende opgradering?</big></b>\n"
+"\n"
+"Systemet kan være i en ubrugelig tilstand hvis du afbryder opgraderingen. "
+"Det anbefales kraftigt at du fortsætter opgraderingen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>Genstart systemet for at afslutte opgraderingen</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Start opgraderinegn?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">Opgraderer til Ubuntu \"Dapper\" "
+"6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Rydder op"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr ""
+msgstr "Detaljer"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Forskel mellem filerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "Henter og installerer opgraderingerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
+#, fuzzy
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Konfigurer softwarekanalerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Klargør opgraderingen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Genstarter systemet"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "Opgraderer Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
-msgstr ""
+msgstr "_Behold"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Replace"
-msgstr ""
+msgstr "_Erstat"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Rapporter fejl"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Genstart nu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Genoptag opgradering"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Kan ikke installere opgraderingerne"
+msgstr "Kunne ikke finde udgivelsesnoterne"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Serveren kan være overbelastet. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Kan ikke hente opgraderingerne"
+msgstr "Kunne ikke hente udgivelsesnoterne"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Undersøg venligst din internetforbindelse"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Kan ikke installere opgraderingerne"
+msgstr "Kunne ikke køre opgraderingsværktøjet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Der er forkommet et uløseligt problem imens beregning af upgraderings tid. "
-"Raporter venligst denne fejl. "
+"Dette er højst sandsynligt en fejl i opgraderingsværktøjet. Raporter "
+"venligst dette som en fejl."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Kan ikke hente opgraderingerne"
+msgstr "Henter opgraderingsværktøjet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Opgraderingsværktøjet vil guide dig igennem opgraderings processen."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Opgrader værkstøjets signatur."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Opgraderingesværktøj"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Fejl ved hentning"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Hentning af opgraderingen fejlede. Det kan være være et netværksproblem. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Fejl ved udpakning"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Udpakningen af opgraderingen fejlede. Det kan være et problem med netværket "
+"eller med serveren. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Efterprøvning fejlede"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Efterprøvning af opgraderingen fejlede. Det er muligvis en fejl i netværket "
+"eller på serveren. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
 msgid "Authentication failed"
-msgstr ""
+msgstr "Godkendelse mislykkedes"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Godkendelse af opgraderingen fejlede. Der er muligvis et problem med "
+"netværket eller med serveren. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, python-format
+#, fuzzy, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr ""
+msgstr "Henter fil %li af %li med %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
 #, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr ""
+msgstr "Henter fil %li af %li med ukendt hastighed"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
+"Fejl ved hentning af ændringslisten. Undersøg venligst din "
+"internetforbindelse."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Kan ikke installere opgraderingerne"
+msgstr "Kan ikke installere alle tilgængelige opdateringer"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -619,249 +709,265 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Nogle opdateringer kræver yderligere software. Brug funktionen \"Vælg alle "
+"opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo "
+"apt-get dist-upgrade\" i en terminal for at opdatere dit system fuldstændigt."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "Følgende opdateringer vil blive sprunget over:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr ""
+msgstr "Henter listen med ændringer..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Overføringsstørelse: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "Dit system er opdateret"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Kan ikke installere opgraderingerne"
 msgstr[1] "Kan ikke installere opgraderingerne"
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr ""
+msgstr "Skjul detaljer"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
-msgstr ""
+msgstr "Vis detaljer"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Vent venligst, dette kan tage et stykke tid."
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr ""
+msgstr "Opdatering udført"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Ny version: %s (Size: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "Din distribution understøtes ikke længere"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Du vil ikke modtage yderligere sikkerhedrettelser eller krittiske "
+"opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www."
+"ubuntu.com (engalsk) for mere informaiton om opgradering."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"Det er kun tilladt at have et softwarestyringsværktøj kørende ad gangen."
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Luk venligst det andet program (f.eks. 'Aptitude eller 'Synaptic') først."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Software indexet er i stykker"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Det er umuligt at installere eller fjerne software. Brug venligst "
+"pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -f"
+"\" i en terminal for at ordne dette problem først."
 
 #: ../data/UpdateManager.glade.h:1
+#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Du må undersøge for opdateringer manuelt</big></b>\n"
+"\n"
+"Dit system undersøger ikke automatisk om der er kommet nye opdateringer. Du "
+"kan indstille denne adfærd i \"System\" -> \"Administration\" -> \"Software "
+"Properties\"."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Hold dit system opdateret</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
+#, fuzzy
 msgid "Cancel _Download"
-msgstr ""
+msgstr "Afbryd _Hentning"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
-msgstr ""
+msgstr "Ændringer"
 
 #: ../data/UpdateManager.glade.h:10
+#, fuzzy
 msgid "Chec_k"
-msgstr ""
+msgstr "_Tjek"
 
 #: ../data/UpdateManager.glade.h:11
+#, fuzzy
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Undersøg softwarekanalerne for nye opdateringer"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
 
 #: ../data/UpdateManager.glade.h:13
+#, fuzzy
 msgid "Release Notes"
-msgstr ""
+msgstr "Udgivelsesnoter"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Vis fremgang for enkelte filer"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
-msgstr ""
+msgstr "Opdateringer"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
-msgstr ""
+msgstr "_Opgrader"
 
 #: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Opgrader til seneste version af Ubuntu"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr ""
+msgstr "_Tjek"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Skjul denne information for fremtiden"
 
 #: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
-msgstr ""
+msgstr "_Installer Opdateringer"
 
 #: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
 msgid "<b>Channels</b>"
-msgstr ""
+msgstr "<b>Kanaler</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
 msgid "<b>Internet updates</b>"
-msgstr ""
+msgstr "<b>Internetopdateringer</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
 msgid "<b>Keys</b>"
-msgstr ""
+msgstr "<b>Nøgler</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "Tilføj _CD-ROM"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
-msgstr ""
+msgstr "Godkendelse"
 
 #: ../data/SoftwareProperties.glade.h:6
+#, fuzzy
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Slet overførte softwarefiler:"
 
 #: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr ""
+msgstr "Importer den offentlige nøgle fra en betroet software"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr ""
+msgstr "Installationsmedie"
 
 #: ../data/SoftwareProperties.glade.h:9
 msgid "Internet Updates"
-msgstr ""
+msgstr "Internetopdateringer"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
-msgstr ""
+msgstr "Gendan _standard"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Gendan standardnøglerne for din distribution"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
-msgstr ""
+msgstr "Softwareindstillinger"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Kontroller automatisk om der er nye opdateringer"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgstr "_Hent opdateringer i baggrunden, men installer dem ikke"
 
 #: ../data/SoftwareProperties.glade.h:16
+#, fuzzy
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelsesdialog"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
 msgstr "     "
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
 msgid ""
 "<b><big>The channel information is out-of-date</big></b>\n"
 "\n"
@@ -870,132 +976,161 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Kanalinformationen er forældet</big></b>\n"
+"\n"
+"Du er nødt til at genopfriske kanalinformationen for at installere softwarre "
+"og opdateringer fra nyligt tilføjede eller ændrede kanaler. \n"
+"\n"
+"Du skal bruge en aktiv internetforbindelse for at fortsætte."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
+#, fuzzy
 msgid "<b>Channel</b>"
-msgstr ""
+msgstr "<b>Kanal</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
-msgstr ""
+msgstr "<b>Kommentar:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
 msgid "<b>Components:</b>"
-msgstr ""
+msgstr "<b>Komponenter:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
+#, fuzzy
 msgid "<b>Components</b>"
-msgstr ""
+msgstr "<b>Komponenter</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
-msgstr ""
+msgstr "<b>Distribution:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
-msgstr ""
+msgstr "<b>Type:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
-msgstr ""
+msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
-msgstr ""
+msgstr "APT-linje:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
+#, fuzzy
 msgid "Add Channel"
-msgstr ""
+msgstr "Tilføj kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
+#, fuzzy
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"Binær\n"
+"Kildetekst"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
+#, fuzzy
 msgid "Edit Channel"
-msgstr ""
+msgstr "Rediger kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Skanner CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
+#, fuzzy
 msgid "_Add Channel"
-msgstr ""
+msgstr "_Tilføj kanal"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr ""
+msgstr "_Brugerdefineret"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 msgid "_Reload"
-msgstr ""
+msgstr "_Genindlæs"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Vis og installer tilgængelige opdateringer"
 
 #: ../data/update-manager.desktop.in.h:2
+#, fuzzy
 msgid "Update Manager"
-msgstr ""
+msgstr "Opdateringshåndtering"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Undersøg automatisk om der er en ny version af din distribution tilgængelig, "
+"og tilbyd at opgradere (hvis det er muligt)."
 
 #: ../data/update-manager.schemas.in.h:2
+#, fuzzy
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Undersøg for ny distributionsudgivelse"
 
 #: ../data/update-manager.schemas.in.h:3
+#, fuzzy
 msgid ""
 "If automatic checking for updates is disabeld, you have to reload the "
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Hvis automatisk undersøgelse for opdateringer er slået fra, er du nødt til "
+"at opdatere kanallisten manuelt. Denne indstilling tillader at påmindelsen "
+"skjules i dette tilfælde."
 
 #: ../data/update-manager.schemas.in.h:4
+#, fuzzy
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Påmind om at genopfriske kanallisten"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Vis detaljer for opdatering"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Gemmer størrelsen på opdateringshåndteringens dialog"
 
 #: ../data/update-manager.schemas.in.h:7
+#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
+"Gemmer tilstanden for udfolderen der indeholder listen med ændringer og "
+"beskrivelsen af dem."
 
 #: ../data/update-manager.schemas.in.h:8
+#, fuzzy
 msgid "The window size"
-msgstr ""
+msgstr "Vinduesstørrelsen"
 
 #: ../data/software-properties.desktop.in.h:1
+#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr ""
+msgstr "Konfigurer softwarekanaler og internetopdateringer"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
-msgstr ""
+msgstr "Softwareinstillinger"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
@@ -1006,47 +1141,50 @@ msgstr ""
 #. Description
 #: ../channels/Ubuntu.info.in:6
 msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr ""
+msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 msgid "Ubuntu 6.06 Security Updates"
-msgstr ""
+msgstr "Ubuntu 6.06 Sikkerhedsopdateringer"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 msgid "Ubuntu 6.06 Updates"
-msgstr ""
+msgstr "Ubuntu 6.06 Opdateringer"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
+#, fuzzy
 msgid "Ubuntu 6.06 Backports"
-msgstr ""
+msgstr "Ubuntu 6.06 Backports"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
 
 #. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Opdateringer"
 
 #. Description
 #: ../channels/Ubuntu.info.in:125
+#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+#, fuzzy
 msgid "Officially supported"
-msgstr ""
+msgstr "Officielt understøttet"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:131
@@ -1056,12 +1194,12 @@ msgstr ""
 #. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr ""
+msgstr "Vedligeholdt af fællesskabet (Universe)"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Ikke frit programmel (Multiverse)"
 
 #. ChangelogURI
 #: ../channels/Debian.info.in.h:4
@@ -1072,7 +1210,7 @@ msgstr ""
 #. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
 #. BaseURI
 #: ../channels/Debian.info.in:19
@@ -1082,7 +1220,7 @@ msgstr ""
 #. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\" Sikkerhedsopdateringer"
 
 #. Description
 #: ../channels/Debian.info.in:34
diff --git a/po/de.po b/po/de.po
index 30e4bb3a..1db56e66 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,20 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-09 00:46+0000\n"
-"Last-Translator: Peter Jochum <peter.jochum@gmail.com>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-02 14:17+0000\n"
+"Last-Translator: Andreas Nagl <andreas.nagl@aon.at>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Täglich"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Alle %s Tage"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Alle zwei Wochen"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Alle %s Tage"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Nach einer Woche"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Nach zwei Wochen"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Nach einem Monat"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -69,46 +97,46 @@ msgstr "Geben Sie einen Namen für das Medium ein"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr "Bitte legen Sie ein Medium in das Laufwerk"
+msgstr "Bitte legen Sie ein Medium in das Laufwerk:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr "Kaputte Pakete"
+msgstr "Defekte Pakete"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
-"Ihr System enhält kaputte Pakete, die nicht mit dieser Software repariert "
+"Ihr System enthält defekte Pakete, die nicht mit dieser Software repariert "
 "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor "
 "Sie fortfahren."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr "Kann die benötigten Metapakete nicht aktualisieren"
+msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr "Ein wichtiges Paket müsste entfernt werden"
+msgstr "Ein grundlegendes Paket müsste entfernt werden"
 
 #. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr "Konnte die Aktualisierung nicht ausrechnen"
+msgstr "Die Aktualisierung konnte nicht berechnet werden"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Ein unlösbares Problem trat beim Ausrechnen der Aktualisierung auf. Bitte "
+"Ein unlösbares Problem trat beim Berechnen der Aktualisierung auf. Bitte "
 "erstellen Sie hierfür einen Fehlerbericht. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
-msgstr "Fehler beim Authentifizieren einiger Pakete"
+msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
 msgid ""
@@ -116,27 +144,28 @@ msgid ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
-"Einige Pakete konnten nicht authentifiziert werden. Dies kann an "
-"vorübergehenden Netzwerkproblemen liegen. Bitte probieren Sie es später noch "
-"einmal. Die unten stehenden Pakete konnten nicht authentifiziert werden:"
+"Einige Pakete konnten nicht auf ihre Echtheit hin bestätigt werden. Dies "
+"kann an vorübergehenden Netzwerkproblemen liegen. Bitte probieren Sie es "
+"später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre "
+"Echtheit hin bestätigt werden:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Kann ›%s‹ nicht installieren"
+msgstr "›%s‹ kann nicht installiert werden"
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Ein notwendiges Paket konnte nicht installiert werden. Bitte erstellen Sie "
-"hierfür einen Fehlerbericht. "
+"Ein erforderliches Paket konnte nicht installiert werden. Bitte erstellen "
+"Sie hierfür einen Fehlerbericht. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
-msgstr "Kann kein Meta-Paket erraten"
+msgstr "Metapaket konnte nicht bestimmt werden"
 
 #: ../DistUpgrade/DistUpgradeCache.py:242
 msgid ""
@@ -146,184 +175,234 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Ihr System enhält kein ›ubuntu-desktop‹-, ›kubuntu-desktop‹- oder ›edubuntu-"
-"desktop‹-Paket, daher konnte Ihre Ubuntu-Version nicht erkannt werden.\n"
+"Ihr System enthält weder ein »ubuntu-desktop«-, ein»kubuntu-desktop»- noch "
+"ein »edubuntu-desktop«-Paket. Daher konnte Ihre Ubuntu-Version nicht "
+"ermittelt werden.\n"
 " Bitte installieren Sie eines der obigen Pakete über Synaptic oder apt-get, "
 "bevor Sie fortfahren."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr "Lese Speicher"
+msgstr "Zwischenspeicher wird ausgelesen"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Kein gültiger Mirror gefunden"
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, fuzzy, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+"Beim Lesen Ihrer Quellen-Information wurde kein Mirror-Eintrag für das "
+"Upgrade gefunden. Dies kann auftreten, wenn Sie einen internen Mirror "
+"verwenden oder die Mirror-Informationen veraltet sind.\n"
+"\n"
+"Möchten Sie Ihre 'sources.list'-Datei dennoch erneuern? Wenn hier Sie 'Ja' "
+"wählen, werden alle Einträge von '%s' bis '%s' aktualisiert.\n"
+"Wenn Sie 'Nein' wählen, wird das Update abgebrochen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Kein gültiger Eintrag gefunden"
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+#, fuzzy
+msgid "Generate default sources?"
+msgstr "Standardquellen generieren?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Beim Lesen ihrer Kanalliste konnte kein gültiger Eintrag für die "
-"Aktualisierung gefunden werden.\n"
+"Nach dem Überprüfen Ihrer 'sources.list' wurde kein gültiger Eintrag für '%"
+"s' gefunden.\n"
+"\n"
+"Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' "
+"auswählen, wird das Update abgebrochen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
-msgstr "Ungültige Kanallisteninformationen"
+msgstr "Ungültige Kanalinformationen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
-"Das Aktualisieren der Quelliste ergab eine ungültige Datei. Bitte erstellen "
-"Sie hierfür einen Fehlerbericht."
+"Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte "
+"erstellen Sie einen Fehlerbericht."
+
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Quellen von Drittanbietern deaktiviert"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+#, fuzzy
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Einige Einträge von Drittanbietern wurden in Ihrer sources.list deaktiviert. "
+"Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug "
+"oder mit Synaptic reaktivieren."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
-msgstr "Fehler beim Aktualisieren"
+msgstr "Fehler während der Aktualisierung"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
-"Bei der Aktualisierung trat ein Problem auf. Dies ist normalerweise auf "
+"Während der Aktualisierung trat ein Problem auf. Dies ist für gewöhnlich auf "
 "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre "
 "Netzwerkverbindung und versuchen Sie es noch einmal."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
-msgstr "Nicht genug Platz auf der Festplatte verfügbar"
+msgstr "Unzureichender freier Festplattenspeicher"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#, fuzzy, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
-"Die Aktualisierung wird jetzt abgebrochen. Bitte leeren Sie mindestens %s "
-"\r\n"
-"Festplattenplatz. Leeren Sie ihren Mülleimer und entfernen Sie temporäre "
-"Pakete von vorherigen Installationen mit ›sudo apt-get clean‹."
+"Die Aktualisierung wird jetzt abgebrochen. Bitte schaffen Sie mindestens %s "
+"an freien Festplattenspeicher. Leeren Sie ihren Mülleimer und entfernen Sie "
+"temporäre Pakete von früheren Installationen mit »sudo apt-get clean«."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Möchten Sie die Aktualisierung starten?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr "Konnte die Aktualisierungen nicht installieren"
+msgstr "Die Aktualisierungen konnten nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
-"Die Aktualisierung wird jetzt abgebrochen. Ihr Systemkönnte in einem "
-"unbenutzbaren Zustand sein. Eine Wiederherstellung wird ausgeführt (dpkg --"
-"configure -a)."
+"Das Upgrade wird jetzt abgebrochen. Ihr System kann sich in einem "
+"unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt "
+"(dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr "Konnte die Aktualisierungen nicht herunterladen"
+msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 "Die Aktualisierung wird jetzt abgebrochen. Bitte überprüfen Sie Ihre "
-"Verbindung zum Internet oder Ihr Installationsmedium und versuchen Sie es "
-"noch einmal. "
+"Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch "
+"einmal. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Veraltete Pakete entfernen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
-msgstr "Diesen _Schritt überspringen"
+msgstr "Ü_berspringen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Fehler beim Anwenden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
-"Ein Problem trat beim Aufräumen auf. Bitte lesen Sie die untenstehende "
-"Nachricht für mehr Informationen. "
+"Ein Problem trat beim Aufräumen auf. Bitte lesen Sie die unten stehende "
+"Nachricht für nähere Informationen. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
-msgstr "Paketmanager wird überprüft"
+msgstr "Paketverwaltung wird überprüft"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
-msgstr "Aktualisiere Paketquellen"
+msgstr "Aktualisiere Quellen-Information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Ungültige Paketinformationen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:400
+#, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Nachdem Ihre Paketinformationen aktualisiert wurden, ist das Paket '%s' "
+"nicht mehr auffindbar.\n"
+"Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür "
+"einen Fehlerbericht."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
-msgstr "Frage nach Bestätigung"
+msgstr "Nach Bestätigung fragen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Aktualisiere"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr "Suche nach veralteter Software"
+msgstr "Nach veralteter Software wird gesucht"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
-msgstr "Aktualisierung abgeschlossen."
+msgstr "Aktualisierung ist abgeschlossen."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr "Bitte legen Sie das Medium ›%s‹ in das Laufwerk ›%s‹"
+msgstr "Bitte legen Sie das Medium »%s« in das Laufwerk »%s«"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Herunterladen abgeschlossen"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Lade Datei %li von %li mit %s/s herunter"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s verbleiben"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Lade Datei %li von %li"
@@ -331,112 +410,113 @@ msgstr "Lade Datei %li von %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Änderungen werden angewendet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Konnte ›%s‹ nicht installieren"
+msgstr "›%s‹ konnte nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür einen "
 "Fehlerbericht."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
+#, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
-"Konfigurationsdatei\n"
-"%s ersetzen?"
+"Die Konfigurationsdatei\n"
+"»%s« ersetzen?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
-msgstr "Das 'diff'-Kommando konnte nicht gefunden werden."
+msgstr "Das 'diff'-Kommando konnte nicht gefunden werden"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Ein fataler Fehler ist aufgetreten"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Bitte erstellen Sie einen Fehlerbericht und schließen Sie die Dateien ~/dist-"
-"upgrade.log und ~/dist-upgrade-apt.log in Ihren Bericht ein. Die "
-"Aktualisierung wird jetzt abgebrochen. "
+"Bitte melden Sie dies als Bug und fügen Sie die Dateien /var/log/dist-"
+"upgrade.log und /var/log/dist-upgrade-apt.log Ihrem Report hinzu. Das "
+"Upgrade wird jetzt abgebrochen.\n"
+"Ihre ursprüngliche sources.list wurde in /etc/apt/sources.list.distUpgrade "
+"gespeichert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s Paket wird entfernt."
 msgstr[1] "%s Pakete werden entfernt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s neues Paket wird installiert."
 msgstr[1] "%s neue Pakete werden installiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s Paket wird aktualisiert."
 msgstr[1] "%s Pakete werden aktualisiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Insgesamt müssen %s heruntergeladen werden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
-"Die Aktualisierung kann mehrere Stunden dauern und kann später nicht mehr "
+"Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr "
 "abgebrochen werden."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
-"Schließen Sie alle offenen Anwendungen und Dokumente, um Datenverlust zu "
-"vermeiden."
+"Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und "
+"Dokumente."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr "Konnte keine Aktualisierungen finden"
+msgstr "Es liegen keine Aktualisierungen vor"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
-msgstr "Ihr System wurde schon aktualisiert."
+msgstr "Ihr System wurde bereits aktualisiert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Entferne %s</b>"
+msgstr "<b>%s wird entfernt</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
-msgstr "Installiere %s"
+msgstr "%s wird installiert"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr "Aktualisiere %s"
+msgstr "%s wird aktualisiert"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
@@ -467,29 +547,29 @@ msgid ""
 msgstr ""
 "<b><big>Die laufende Aktualisierung abbrechen?</big></b>\n"
 "\n"
-"Das System könnte in einem unbenutzbaren Zustand verbleiben. Es ist sehr "
-"empfehlenswert, die Aktualisierung fortzusetzen."
+"Das System könnte in einem unbenutzbaren Zustand verbleiben. Sie sind "
+"angehalten die Aktualisierung fortzusetzen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
-"<b><big>Starte das System neu, um die Aktualisierung abzuschließen</big></b>"
+"<b><big>Das System zum Abschluss der Aktualisierung neu starten</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Aktualisierung starten?</big></b>"
+msgstr "<b><big>Mit der Aktualisierung beginnen?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Aktualisiere auf Ubuntu \"Dapper\" "
-"6.06</span>"
+"<span weight=\"bold\" size=\"x-large\">Auf Ubuntu \"Dapper\" 6.06 "
+"aktualisieren</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr "Räume auf"
+msgstr "Aufräumen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
@@ -498,24 +578,24 @@ msgstr "Details"
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
 msgstr ""
-":   \t \t\r\n"
+":   \t \t\n"
 "Unterschiede zwischen den Dateien"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr "Lade Aktualisierungen herunter und installiere"
+msgstr "Aktualisierungen herunter laden und installieren"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Verändere Software-Kanäle"
+msgstr "Software-Kanäle anpassen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "Bereite die Aktualisierung vor"
+msgstr "Aktualisierung vorbereiten"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr "Starte das System neu"
+msgstr "System neu starten"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
@@ -523,13 +603,11 @@ msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr "Aktualisiere Ubuntu"
+msgstr "Ubuntu aktualisieren"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
-msgstr ""
-":   \t \t\r\n"
-"_Beihalten"
+msgstr "_Beibehalten"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Replace"
@@ -537,7 +615,7 @@ msgstr "_Ersetzen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
-msgstr "_Fehlerbericht erstellen"
+msgstr "_Fehlerbericht ausfüllen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
@@ -548,121 +626,126 @@ msgid "_Resume Upgrade"
 msgstr "_Aktualisierung fortsetzen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Konnte keine Aktualisierungen finden"
+msgstr "Freigabemitteilungen konnten nicht gefunden werden"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Der Server ist möglicherweise überlastet. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Konnte die Aktualisierungen nicht herunterladen"
+msgstr "Freigabemitteilungen konnten nicht heruntergeladen werden"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Bitte überprüfen Sie Ihre Internet-Verbindung."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Konnte die Aktualisierungen nicht installieren"
+msgstr "Konnte die Anwendung zur Aktualisierung nicht starten"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Ein unlösbares Problem trat beim Ausrechnen der Aktualisierung auf. Bitte "
-"erstellen Sie hierfür einen Fehlerbericht. "
+"Sehr wahrscheinlich handelt es sich hierbei um einen Fehler in der "
+"Aktualisierungsverwaltung. Bitte erstellen Sie einen Fehlerbericht."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Lade Aktualisierungen herunter und installiere"
+msgstr "Aktualisierungsanwendung wird heruntergeladen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
+"Die Aktualisierungsanwendung wird Sie durch den Aktualisierungsprozess "
+"führen."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Signatur der Aktualisierungsanwendung"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Aktualisiere %s"
+msgstr "Aktualisierungsanwendung"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Herunterladen ist fehlgeschlagen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Das Laden der Aktualisierungen ist fehlgeschlagen. Möglicherweise gibt es "
+"ein Netzwerkproblem "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Extrahieren ist fehlgeschlagen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Das Extrahieren der Aktualisierung ist fehlgeschlagen. Möglicherweise gibt "
+"es Probleme im Netzwerk oder am Server. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Verifikation fehlgeschlagen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Die Prüfung der Aktualisierung ist fehlgeschlagen. Möglicherweise gibt es "
+"Probleme im Netzwerk oder am Server. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "A_uthentifizierung"
+msgstr "Echtheitsbestätigung fehlgeschlagen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Die Echtheitsbestätigung der Aktualisierung ist fehlgeschlagen. "
+"Möglicherweise gibt es Probleme im Netzwerk oder am Server. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "Lade Datei %li von %li mit %s/s herunter"
+msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Lade Datei %li von %li mit unbekannter Geschwindigkeit herunter"
+msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
+"Sie es zu einem späteren Zeitpunkt erneut."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Das Herunterladen der Änderungen ist fehlgeschlagen. Bitte prüfen Sie, ob "
-"eine Internetverbindung besteht."
+"Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte "
+"überprüfen Sie Ihre Internet-Verbindung."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Verfügbare Aktualisierungen anzeigen und installieren"
+msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -670,110 +753,102 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Einige Aktualisierungen erfordern das Entfernen von anderen Anwendungen. "
+"Verwenden Sie die Funktion »Aktualisierungen vormerken« in der Synaptic "
+"Paketverwaltung oder führen Sie den Befehl »sudo apt-get dist-upgrade« in "
+"einem Terminal aus, um Ihr System vollständig zu aktualisieren."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "Die folgenden Pakete wurden nicht aktualisiert: "
+msgstr "Die folgenden Aktualisierungen werden ausgelassen:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Lade Datei %li von %li"
+msgstr "Liste mit Änderungen wird heruntergeladen..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Download-Größe: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Das System ist auf dem aktuellen Stand!"
+msgstr "Ihr System ist auf dem aktuellen Stand"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Verfügbare Aktualisierungen anzeigen und installieren"
-msgstr[1] "Verfügbare Aktualisierungen anzeigen und installieren"
+msgstr[0] "Sie können eine Aktualisierung installieren"
+msgstr[1] "Sie können %s Aktualisierungen installieren"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Details zeigen"
+msgstr "Details verbergen"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Details zeigen"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Herunterladen abgeschlossen"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Geänderte Repositories"
+msgstr "Aktualisierung ist abgeschlossen"
 
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Die Repository-Informationen wurden geändert. Eine Sicherheitskopie der "
-"Datei »sources.list« wurde als »%s.save« gespeichert.\n"
-"\n"
-"Um die Änderungen zu übernehmen, müssen die Paketinformationen der Server "
-"neu abgerufen werden. Wollen Sie dies jetzt tun?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Neue Version: %s"
+msgstr "Neue Version: %s (Größe: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr "Diese Distribution wird nicht länger unterstützt"
+msgstr "Ihre Distribution wird nicht länger unterstützt"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Sie werden keine weiteren Aktualisierungen zur Behebung von "
+"Sicherheitslücken oder kritischen Fehlern erhalten. Aktualisieren Sie Ihr "
+"System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers."
+"de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"Nur eine Anwendung zur Software-Verwaltung kann zur selben Zeit genutzt "
+"werden"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Bitte schließen Sie zuerst andere Anwendungen wie 'aptitude' oder 'Synaptic'."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Der Software-Index ist beschädigt"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Es ist nicht möglich, Software zu installieren oder zu entfernen. Bitte "
+"verwenden Sie zuerst die Synaptic Paketverwaltung oder führen Sie »sudo apt-"
+"get install -f« im Terminal aus, um dieses Problem zu beheben."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -782,23 +857,23 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
-"<b><big>Sie müssen manuell nach Aktualisierungen suchen</big></b>\n"
+"<b><big>Sie müssen manuell auf Aktualisierungen prüfen</big></b>\n"
 "\n"
-"Ihr System sucht nicht automatisch nach verfügbaren Aktualisierungen. Sie "
+"Ihr System prüft nicht automatisch auf verfügbare Aktualisierungen. Sie "
 "können dieses Verhalten über die Menüpunkte \"System\" -> \"Systemverwaltung"
 "\" -> \"Software Eigenschaften\" ändern."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"<big><b>Suche nach verfügbaren Aktualisierungen</b></big>\n"
+"<big><b>Ihr System wird überprüft</b></big>\n"
 "\n"
-"Software-Aktualisierungen können Fehler korrigieren, Sicherheitslücken "
-"beheben und Ihnen neue Funktionen bereitstellen."
+"Software-Updates korrigieren Fehler, beseitigen Sicherheitsmängel und bieten "
+"neue Funktionen."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
@@ -817,9 +892,8 @@ msgid "Chec_k"
 msgstr "_Prüfen"
 
 #: ../data/UpdateManager.glade.h:11
-#, fuzzy
 msgid "Check the software channels for new updates"
-msgstr "Überprüfe die Softwarekanäle auf neue Aktualisierungen"
+msgstr "Software-Kanäle auf Aktualisierungen prüfen"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -827,7 +901,7 @@ msgstr "Beschreibung"
 
 #: ../data/UpdateManager.glade.h:13
 msgid "Release Notes"
-msgstr "Notizen zur Veröffentlichung"
+msgstr "Freigabemitteilung"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
@@ -839,11 +913,11 @@ msgstr "Software-Aktualisierungen"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"Software-Aktualisierungen können Fehler korrigieren, Sicherheitslücken "
-"stopfen und Ihnen neue Funktionen anbieten."
+"Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und "
+"stellen neue Funktionen bereit."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
@@ -859,7 +933,7 @@ msgstr "_Prüfen"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
-msgstr "Diese Information in Zukunft _verstecken"
+msgstr "Diese Information in Zukunft _nicht mehr anzeigen"
 
 #: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
@@ -883,7 +957,7 @@ msgstr "CD-Rom _hinzufügen"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
-msgstr "A_uthentifizierung"
+msgstr "Echtheitheitsbestätigung"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
@@ -892,7 +966,7 @@ msgstr "Heruntergeladene Paketdateien _löschen:"
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
 msgstr ""
-"Den öffentlichen Schlüssel einer vertrauenswürdigen Software-Quelle "
+"Den öffentlichen Schlüsselteil eines vertrauenswürdigen Software-Anbieters "
 "importieren"
 
 #: ../data/SoftwareProperties.glade.h:8
@@ -906,20 +980,18 @@ msgstr "Internet-Aktualisierungen"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Nur Sicherheitsaktualisierungen von den offiziellen Ubuntu-Servern werden "
-"automatisch installiert. Dafür muss das Paket ›unattended-upgrades‹ "
-"installiert werden."
+"automatisch installiert"
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
-msgstr "Vorgabeschlüssel wiederherstellen"
+msgstr "_Vorgabeschlüssel wiederherstellen"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr "Auf die Standardschlüssel Ihrer Distribution zurücksetzen"
+msgstr "Die Vorgabeschlüssel Ihrer Distribution wiederherstellen"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -927,16 +999,16 @@ msgstr "Software-Einstellungen"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr "_Automatisch auf Aktualisierungen überprüfen:"
+msgstr "_Automatisch auf Aktualisierungen prüfen:"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
 msgstr ""
-"Aktualisierungen im Hintergrund herunterladen, aber _nicht installieren"
+"Aktualisierungen im _Hintergrund herunterladen, aber nicht installieren"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr "Sicherheitsaktualisierungen ohne Bestätigung _installieren"
+msgstr "Sicherheitsaktualisierungen _ohne Bestätigung installieren"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
@@ -951,12 +1023,12 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>The Kanal-Informationen sind veraltet</big></b>\n"
+"<b><big>Die Kanal-Informationen sind veraltet</big></b>\n"
 "\n"
 "Sie müssen die Kanal-Informationen neu laden, um Software und "
 "Aktualisierungen von neuen oder geänderten Kanälen installieren zu können. \n"
 "\n"
-"Sie brauchen ein laufende Internetverbindung, um fortzufahren."
+"Sie benötigen hierfür eine bestehende Internet-Verbindung."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
@@ -971,9 +1043,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Komponenten:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Komponenten:</b>"
+msgstr "<b>Komponenten</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -992,15 +1063,14 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Geben Sie die vollständige APT-Zeile für den Kanal ein, der "
-"hinzugefügt werden soll</b></big>\n"
+"<big><b>Geben Sie die vollständige APT-Zeile für den Kanal ein, den sie "
+"hinzufügen wollen</b></big>\n"
 "\n"
-"Die APT-Zeile enthält den Typ, den Ort und den Inhalt der Paketquelle, z.B. "
-"<i>»deb http://ftp.debian.org sarge main«</i>. Eine ausführliche "
-"Beschreibung des Syntax ist in der Dokumentation zu finden."
+"Die APT-Zeile enthält den Typ, den Ort und die Komponenten des Software-"
+"Kanals, z.B. <i>»deb http://ftp.debian.org sarge main«</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -1052,10 +1122,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Automatisch auf neue Versionen der Distribution prüfen und gegebenenfalls "
+"eine Aktualisierung auf diese anbieten."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Auf neue Versionen der Distribution prüfen"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1092,9 +1164,8 @@ msgid "The window size"
 msgstr "Die Fenstergröße"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Überprüfe die Softwarekanäle auf neue Aktualisierungen"
+msgstr "Software-Kanäle und Aktualisierungen konfigurieren"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1109,7 +1180,7 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../channels/Ubuntu.info.in:6
 msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 6.06 ›Dapper Drake‹"
+msgstr "Ubuntu 6.06 \"Dapper Drake\""
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
@@ -1129,7 +1200,7 @@ msgstr "Ubuntu 6.06 Backports"
 #. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 ›Breezy Badger‹"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../channels/Ubuntu.info.in:91
@@ -1175,7 +1246,7 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian 3.1 ›Sarge‹"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. BaseURI
 #: ../channels/Debian.info.in:19
@@ -1185,12 +1256,12 @@ msgstr "http://security.debian.org/"
 #. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian 3.1 ›Sarge‹ Sicherheitsaktualisierungen"
+msgstr "Debian 3.1 \"Sarge\" Sicherheitsaktualisierungen"
 
 #. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian ›Etch‹ (testing)"
+msgstr "Debian \"Etch\" (testing)"
 
 #. BaseURI
 #: ../channels/Debian.info.in:47
@@ -1200,7 +1271,7 @@ msgstr "http://http.us.debian.org/debian/"
 #. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian ›Sid‹ (unstable)"
+msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
 #: ../channels/Debian.info.in:54
@@ -1212,6 +1283,56 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten"
 msgid "Non-DFSG-compatible Software"
 msgstr "Nicht DFSG-kompatible Software"
 
+#~ msgid "No valid entry found"
+#~ msgstr "Keinen gültigen Eintrag gefunden"
+
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Beim Lesen Ihrer Kanalliste konnte kein gültiger Eintrag für die "
+#~ "Aktualisierung gefunden werden.\n"
+
+#~ msgid ""
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery is now run (dpkg --configure -a)."
+#~ msgstr ""
+#~ "Die Aktualisierung wird jetzt abgebrochen. Ihr System könnte in einem "
+#~ "unbenutzbaren Zustand sein. Ein Wiederherstellungsversuch wird nun "
+#~ "unternommen (dpkg --configure -a)."
+
+#~ msgid ""
+#~ "Please report this as a bug and include the files '/var/log/dist-upgrade."
+#~ "log' and '/var/log/dist-upgrade-apt.log' in your report. The upgrade "
+#~ "aborts now. "
+#~ msgstr ""
+#~ "Bitte füllen Sie einen Fehlerbericht hierzu aus und legen Sie die Dateien "
+#~ "» »/var/log/dist-upgrade.log« und »/var/log/dist-upgrade-apt.log« Ihren "
+#~ "Bericht bei. Die Aktualisierung wird jetzt abgebrochen. "
+
+#~ msgid ""
+#~ "<big><b>Analysing your system</b></big>\n"
+#~ "\n"
+#~ "Software updates correct errors, eliminate security vulnerabilities and "
+#~ "provide new features."
+#~ msgstr ""
+#~ "<big><b>Ihr System wird untersucht</b></big>\n"
+#~ "\n"
+#~ "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und "
+#~ "stellen neue Funktionen bereit."
+
+#, fuzzy
+#~ msgid "Repositories changed"
+#~ msgstr "Geänderte Repositories"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Um die Änderungen zu übernehmen, müssen die Paketinformationen der Server "
+#~ "neu abgerufen werden. Wollen Sie dies jetzt tun?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Sparten:</b>"
 
diff --git a/po/el.po b/po/el.po
index e25ecbba..40c36d25 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-05 14:17+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-29 10:27+0000\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Ημερησίως"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Κάθε δύο ημέρες"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Εβδομαδιαίως"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Κάθε δύο εβδομάδες"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Κάθε %s ημέρες"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Μετά από μια εβδομάδα"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Μετά από δύο εβδομάδες"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Μετά από ένα μήνα"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -154,23 +182,54 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Ανάγνωση λανθάνουσας μνήμης"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Δεν βρέθηκε έγκυρη καταχώριση"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+"Κατά τον έλεγχο των πληροφοριών repository, δεν βρέθηκε καταχώριση "
+"εναλλακτικής τοποθεσίας αρχείων για την αναβάθμιση. Αυτό μπορεί να συμβαίνει "
+"αν εκτελείτε μια εσωτερική εναλλακτική τοποθεσία αρχείων ή αν η πληροφορίες "
+"εναλλακτικής τοποθεσίας είναι παρωχημένες.\n"
+"\n"
+"Θέλετε να αντικατασταθεί το αρχείο 'sources.list' οπωσδήποτε; Αν επιλέξετε "
+"εδώ 'Ναι' θα ενημερωθούν όλες οι '%s' καταχωρίσεις σε '%s'.\n"
+" Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Δημιουργία προεπιλεγμένων πηγών;"
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Κατά τον έλεγχο των πληροφοριών του repository δεν βρέθηκαν έγκυρες "
-"καταχωρίσεις αναβάθμισης.\n"
+"Μετά τον έλεγχο του  'sources.list'  δεν βρέθηκε έγκυρη καταχώριση για το '%"
+"s'.\n"
+"\n"
+"Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε "
+"'Όχι' η ενημέρωση θα ακυρωθεί."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Μη έγκυρες πληροφορίες repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -178,11 +237,25 @@ msgstr ""
 "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο "
 "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Απενεργοποιήθηκαν πηγές τρίτων"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Μερικές καταχωρίσεις τρίτων έχουν απενεργοποιηθεί στο αρχείο souces.list. "
+"Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-"
+"properties' ή με το synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Σφάλμα κατά την ενημέρωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -190,11 +263,11 @@ msgstr ""
 "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει "
 "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -205,16 +278,15 @@ msgstr ""
 "στο δίσκο. Αδειάστε τα απορρίμματα σας και αφαιρέστε διάφορα προσωρινά "
 "πακέτα από προηγούμενες εγκαταστάσεις με την εντολή 'sudo apt-get clean'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
@@ -222,11 +294,11 @@ msgstr ""
 "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. "
 "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Αδυναμία λήψης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -234,23 +306,23 @@ msgstr ""
 "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
 "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Αφαίρεση παρωχημένων πακέτων;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "Παράκα_μψη αυτου του βήματος"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Απομάκρυνση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Σφάλμα κατά την υποβολή"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -260,65 +332,69 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Έλεγχος διαχειριστή πακέτων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Ενημέρωση πληροφοριών repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Μη έγκυρες πληροφορίες πακέτου"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Μετά την ενημέρωση των πληροφοριών πακέτων, δεν μπορεί να βρεθεί το "
+"απαραίτητο πακέτο '%s'.\n"
+" Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Ερώτηση για επιβεβαίωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Γίνεται αναβάθμιση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Η λήψη ολοκληρώθηκε"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Λήψη αρχείου %li από %li με %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s απομένουν"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Λήψη αρχείου %li από %li"
@@ -326,21 +402,21 @@ msgstr "Λήψη αρχείου %li από %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Γίνεται εφαρμογή αλλαγών"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Η αναβάθμιση θα τερματιστεί τώρα. Παρακαλώ αναφέρετε το ως σφάλμα."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -349,84 +425,85 @@ msgstr ""
 "Αντικατάσταση αρχείου ρύθμισης\n"
 "'%s';"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Η εντολή 'diff' δεν βρέθηκε"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Προέκυψε μοιραίο σφάλμα"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία ~/dist-upgrade.log "
-"και ~/dist-upgrade-apt.log στην αναφορά σας. Η αναβάθμιση τώρα θα "
-"τερματιστεί. "
+"Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία /var/log/dist-"
+"upgrade.log και /var/log/dist-upgrade-apt.log στην αναφορά σας. Η αναβάθμιση "
+"τώρα θα\n"
+"\"τερματιστεί. Το αρχικό αρχείο sources.list αποθηκεύτηκε στο /etc/apt/"
+"sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί."
 msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί."
 msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί."
 msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
-"Η αναβάθμιση μπορεί να διαρκέσει αρκετέςς ώρες και δεν είναι δυνατή η "
-"ακύρωση της αργότερα."
+"Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η ακύρωση "
+"της αργότερα."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και "
 "έγγραφα."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Δεν βρέθηκαν αναβαθμίσεις"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Απομάκρυνση %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Εγκατάσταση %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Αναβάθμιση %s"
@@ -537,118 +614,120 @@ msgid "_Resume Upgrade"
 msgstr "_Συνέχεια αναβάθμισης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Δεν βρέθηκαν αναβαθμίσεις"
+msgstr "Αδυναμία εύρεσης σημειώσεων έκδοσης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Ο εξυπηρετητής μπορεί να είναι υπερφορτωμέμος "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Αδυναμία λήψης των αναβαθμίσεων"
+msgstr "Αδυναμία λήψης των σημειώσεων έκδοσης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Παρακαλώ ελέγξτε τη σύνδεση σας με το διαδίκτυο."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων"
+msgstr "Αδυναμία εκτέλεσης του εργαλείου αναβαθμίσεων"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης. "
-"Παρακαλώ αναφέρετε το ως σφάλμα. "
+"Αυτό πιθανόν να είναι σφάλμα του εργαλείου αναβάθμισης. Παρακαλώ αναφέρετε "
+"το ως σφάλμα."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Λήψη και εγκατάσταση των αναβαθμίσεων"
+msgstr "Λήψη του εργαλείου αναβάθμισης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Το εργαλείο αναβάθμισης θα σας καθοδηγήσει στην διαδικασία ενημέρωσης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Υπογραφή εργαλείου αναβάθμισης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Αναβάθμιση %s"
+msgstr "Εργαλείο αναβάθμισης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Αποτυχία λήψης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Η λήψη της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Αποτυχία αποσυμπίεσης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Η αποσυμπίεση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
+"εξυπηρετητή. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Αποτυχία επαλήθευσης"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Η επαλήθευση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
+"εξυπηρετητή. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Πιστοποίηση"
+msgstr "Η πιστοποίηση απέτυχε"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Η πιστοποίηση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή "
+"εξυπηρετητή. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Λήψη αρχείου %li από %li με %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
+"Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Προβολή και εγκατάσταση διαθέσιμων ενημερώσεων"
+msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -656,101 +735,100 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Μερικές ενημερώσεις απαιτούν την απομάκρυνση επιπρόσθετου λογισμικού. "
+"Χρησιμοποιήστε την λειτουργία \"Σημείωση όλων των αναβαθμίσεων\" από το "
+"διαχειριστή πακέτων ή την εντολή \"sudo apt-get dist-upgrade\" σε ένα "
+"τερματικό για να αναβαθμίσετε πλήρως το σύστημα σας."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "Έκδοση%s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Λήψη αρχείου %li από %li"
+msgstr "Λήψη της λίστας των αλλαγών..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Μέγεθος λήψης: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "Το σύστημα σας είναι ενημερωμένο"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Προβολή και εγκατάσταση διαθέσιμων ενημερώσεων"
-msgstr[1] "Προβολή και εγκατάσταση διαθέσιμων ενημερώσεων"
+msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση"
+msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Εμφάνιση λεπτομερειών"
+msgstr "Απόκρυψη λεπτομερειών"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Εμφάνιση λεπτομερειών"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Η λήψη ολοκληρώθηκε"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
+msgstr "Η ενημέρωση ολοκληρώθηκε"
 
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Νέα έκδοση: %s (Μέγεθος: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "Η διανομή σας δεν υποστηρίζεται πια"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Δεν θα μπορείτε να λαμβάνετε περίπτερο ενημερώσεις και σημαντικές "
+"αναβαθμίσεις. Θα πρέπει να κάνετε αναβάθμιση σε μια νεότερη έκδοση του "
+"Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες "
+"για την αναβάθμιση."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Μόνο ένα εργαλείο διαχείρισης λογισμικού μπορεί να εκτελείται."
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Παρακαλώ κλείστε την άλλη εφαρμογή πρώτα π.χ. το 'aptitude' ή το 'Synaptic'."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Είναι αδύνατη η προσθήκη ή η απομάκρυνση λογισμικού. Παρακαλώ χρησιμοποιήστε "
+"το διαχειριστή πακέτων \"Synaptic\" η εκτελέστε την εντολή \"sudo apt-get "
+"install -f\" σε ένα τερματικό για να διορθώσετε το πρόβλημα πρώτα."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -767,10 +845,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Γίνεται ανάλυση του συστήματος σας</b></big>\n"
 "\n"
@@ -815,8 +893,8 @@ msgstr "Αναβαθμίσεις λογισμικού"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και "
 "να παρέχουν νέες λειτουργίες."
@@ -831,7 +909,7 @@ msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubunt
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr "Ελε_γχος"
+msgstr "Έλε_γχος"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
@@ -880,12 +958,10 @@ msgstr "Αναβαθμίσεις διαδικτύου"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
-"Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους Ubuntu "
-"servers θα εγκαθίστανται αυτόματα. Θα πρέπει να εγκατασταθεί το πακέτο "
-"\"unattended-upgrades\"."
+"Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους "
+"εξυπηρετητές του Ubuntu  θα εγκαθίστανται αυτόματα."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -924,7 +1000,7 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"b><big>Οι πληροφορίες καναλιού δεν είναι  ενημερωμένες</big></b>\n"
+"<b><big>Οι πληροφορίες καναλιού δεν είναι  ενημερωμένες</big></b>\n"
 "\n"
 "Θα πρέπει να ανανεώσετε τις πληροφορίες καναλιού για να εγκαταστήσετε "
 "λογισμικό και ενημερώσεις από τα τα νέα κανάλια που προσθέσατε ή "
@@ -945,9 +1021,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Στοιχεία:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Στοιχεία:</b>"
+msgstr "<b>Στοιχεία</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -966,7 +1041,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Εισάγετε την πλήρη γραμμή  APT του καναλιού που θέλετε να "
@@ -1025,10 +1100,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Αυτόματος έλεγχος αν είναι διαθέσιμη μια νεότερη έκδοση της τρέχουσας "
+"διανομής και προσφέρει αναβάθμιση."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Έλεγχος για νέες εκδόσεις της διανομής"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1064,14 +1141,12 @@ msgid "The window size"
 msgstr "Το μέγεθος του παραθύρου"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Έλεγχος των καναλιών λογισμικού για ενημερώσεις"
+msgstr "Ρύθμιση των καναλιών λογισμικού για ενημερώσεις"
 
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Properties"
-msgstr "Προτιμήσεις λογισμικού"
+msgstr "Ιδιότητες λογισμικού"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
@@ -1185,6 +1260,13 @@ msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες
 msgid "Non-DFSG-compatible Software"
 msgstr "Λογισμικό μη συμβατό με DFSG"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Κατά τον έλεγχο των πληροφοριών του repository δεν βρέθηκαν έγκυρες "
+#~ "καταχωρίσεις αναβάθμισης.\n"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Ενότητες</b>"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index ae952aef..9fac7bfa 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:23+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:30+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Details</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -138,42 +167,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Error removing the key"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -181,47 +241,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -229,21 +289,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -251,45 +311,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -297,101 +357,101 @@ msgstr ""
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -521,7 +581,7 @@ msgstr ""
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"The key you selected could not be removed. Please report this as a bug. "
+"The key you selected could not be removed. Please report this as a bug."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "Downloading the upgrade tool"
@@ -596,7 +656,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Failed to download changes. Please check if there is an active internet "
 "connection."
@@ -616,100 +677,84 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:195
 #, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "The following packages are not upgraded: "
+msgstr "The following packages are not upgraded:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Cancel downloading the ChangeLog"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installing updates..."
 msgstr[1] "Installing updates..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Details</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Repositories changed"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"The repository information has changes. A backup copy of your sources.list "
-"is stored in %s.save. \n"
-"\n"
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "New version: %s"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is no longer supported"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -726,10 +771,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -770,8 +815,8 @@ msgstr "Software Updates"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -843,8 +888,7 @@ msgstr "<b>Internet Updates</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -923,7 +967,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Enter the complete APT line of the repository that you want to add</"
@@ -1147,6 +1191,20 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Repositories changed"
+#~ msgstr "Repositories changed"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "The repository information has changes. A backup copy of your sources."
+#~ "list is stored in %s.save. \n"
+#~ "\n"
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+
 #, fuzzy
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Sections:</b>"
diff --git a/po/en_GB.po b/po/en_GB.po
index 8cf07694..ed7726ad 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:23+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:30+0000\n"
 "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Details</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -137,42 +166,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Error removing the key"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -180,47 +240,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -228,21 +288,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -250,46 +310,46 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Checking system configuration"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -297,101 +357,101 @@ msgstr ""
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Downloading changes..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Your system has broken packages!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -520,7 +580,7 @@ msgstr ""
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"The key you selected could not be removed. Please report this as a bug. "
+"The key you selected could not be removed. Please report this as a bug."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -595,7 +655,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Failed to download changes. Please check if there is an active internet "
 "connection."
@@ -615,100 +676,84 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:195
 #, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "The following packages are not upgraded: "
+msgstr "The following packages are not upgraded:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Downloading Changes"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Downloading Changes"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installing updates..."
 msgstr[1] "Installing updates..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Details</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Repositories changed"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"The repository information has changes. A backup copy of your sources.list "
-"is stored in %s.save. \n"
-"\n"
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is no longer supported"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -725,10 +770,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -769,8 +814,8 @@ msgstr "Software Updates"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -841,8 +886,7 @@ msgstr "<b>Internet Updates</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -923,7 +967,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Enter the complete APT line of the repository that you want to add</"
@@ -1147,6 +1191,20 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Repositories changed"
+#~ msgstr "Repositories changed"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "The repository information has changes. A backup copy of your sources."
+#~ "list is stored in %s.save. \n"
+#~ "\n"
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+
 #, fuzzy
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Sections:</b>"
diff --git a/po/es.po b/po/es.po
index dcccbad5..0e011109 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-08 13:26+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-29 09:58+0000\n"
 "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,39 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Todos los días"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Cada dos días"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Una vez a la semana"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Cada dos semanas"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Cada %s días"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Después de una semana"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Después de dos semanas"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Después de un mes"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -137,7 +165,7 @@ msgstr ""
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
-msgstr "No se ha podido suponer el meta-paquete"
+msgstr "No se ha podido determinar el meta-paquete"
 
 #: ../DistUpgrade/DistUpgradeCache.py:242
 msgid ""
@@ -157,23 +185,54 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Leyendo caché"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "No se ha encontrado una entrada válida"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "No se ha encontrado un servidor espejo válido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"Cuando se exploraba la información de su repositorio, se encontró una "
-"entrada no válida para la actualización.\n"
+"Al examinar la información de sus repositorios no se ha encontrado ninguna "
+"entrada de servidor espejo para la actualización. Esto puede ocurrir si está "
+"usando un servidor espejo interno, o si la información del servidor espejo "
+"está desactualizada.\n"
+"\n"
+"¿Desea reescribir su archivo «sources.list» de todos modos? Si selecciona "
+"«Sí», se actualizarán todas las entradas «%s» a «%s».\n"
+"Si selecciona «No» se cancelará la actualización."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "¿Generar orígenes predeterminados?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+"Tras examinar su «sources.list», no se han encontrado entradas válidas para "
+"«%s».\n"
+"\n"
+"¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se "
+"cancelará la actualización."
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Información de repositorio no válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -181,11 +240,25 @@ msgstr ""
 "La actualización de la información del repositorio generó un archivo "
 "incorrecto. Por favor, informe de ésto como un error."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Orígenes de terceros desactivados"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Se han desactivado algunas entradas de terceros en su «sources.list». Puede "
+"volver a activarlas tras la actualización con la herramienta «Propiedades "
+"del software», o con Synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Error durante la actualización"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -194,11 +267,11 @@ msgstr ""
 "tipo de problema en la red, por lo que le recomendamos que compruebe su "
 "conexión de red y vuelva a intentarlo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "No hay espacio suficiente en el disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -209,29 +282,28 @@ msgstr ""
 "espacio en disco. Vacíe su papelera y elimine los paquetes temporales de "
 "instalaciones anteriores usando «sudo apt-get clean» en una terminal."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "¿Desea comenzar la actualización?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "No se han podido instalar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 "La actualización se cancelará ahora. Su sistema puede haber quedado en un "
-"estado inutilizable. Se llevará a cabo ahora una recuperación (dpkg --"
+"estado inutilizable. Se está llevando a cabo una recuperación (dpkg --"
 "configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "No se han podido descargar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -239,23 +311,23 @@ msgstr ""
 "La actualización se cancelará ahora. Por favor, compruebe su conexión a "
 "internet (o su soporte de instalación) y vuelva a intentarlo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "¿Desinstalar los paquetes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Saltar este paso"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Error durante la confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -265,65 +337,69 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Comprobando gestor de paquetes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Actualizando la información del repositorio"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Información de paquete no válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Después de haberse actualizado la información de sus paquetes, ya no es "
+"posible encontrar el paquete esencial «%s».\n"
+"Esto indica un problema serio; por favor, informe de esto como un fallo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Solicitando confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Actualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Buscando paquetes obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "La actualización del sistema se ha completado."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor, inserte «%s» en la unidad «%s»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "La descarga se ha completado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Descargando archivo %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s restantes"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Descargando archivo %li de %li"
@@ -331,22 +407,22 @@ msgstr "Descargando archivo %li de %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Aplicando los cambios"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "No se ha podido instalar «%s»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "La actualización se cancelará ahora. Por favor, avise de esto como un fallo."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -355,84 +431,85 @@ msgstr ""
 "¿Desea reemplazar el archivo de configuración\n"
 "«%s»?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "No se ha encontrado el comando «diff»"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Ha ocurrido un error fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Por favor, informe de esto como un fallo e incluya los ficheros ~/dist-"
-"upgrade.log y ~/dist-upgrade-apt.log en su informe. La actualización se "
-"cancelará ahora. "
+"Por favor, informe de esto como un fallo e incluya los archivos /var/log/"
+"dist-upgrade.log y /var/log/dist-upgrade-apt.log en su informe. La "
+"actualización se cancelará ahora.\n"
+"Su archivo «sources.list» original se guardó en /etc/apt/sources.list."
+"distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Se va a desinstalar %s paquete."
 msgstr[1] "Se van a desinstalar %s paquetes."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "Se va a instalar %s paquete nuevo."
 msgstr[1] "Se van a instalar %s paquetes nuevos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "Se va a actualizar %s paquete."
 msgstr[1] "Se van a actualizar %s paquetes."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Debe descargar un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "La actualización puede durar varias horas, y no puede cancelarse después en "
 "ningún momento."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Para prevenir la pérdida de datos, cierre todas las aplicaciones y "
 "documentos."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "No se ha podido encontrar ninguna actualización"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Su sistema ya ha sido actualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Desinstalar %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
@@ -542,121 +619,126 @@ msgid "_Resume Upgrade"
 msgstr "_Continuar actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "No se ha podido encontrar ninguna actualización"
+msgstr "No se han podido encontrar las notas de publicación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Puede que el servidor esté sobrecargado. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "No se han podido descargar las actualizaciones"
+msgstr "No se han podido descargar las notas de publicación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Por favor, compruebe su conexión a Internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "No se han podido instalar las actualizaciones"
+msgstr "No se ha podido ejecutar la herramienta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Ha ocurrido un problema imposible de resolver cuando se calculaba la "
-"actualización. Por favor, informe de ésto como un error: "
+"Esto parece ser un fallo en la herramienta de actualización. Por favor, "
+"informe de ésto como un error."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Descargando e instalando las actualizaciones"
+msgstr "Descargando la herramienta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
+"La herramienta de actualización le guiará a través del proceso de "
+"actualización."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Firma de la herramienta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Actualizar %s"
+msgstr "Herramienta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Error al descargar"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Ha fallado la descarga de la actualización. Puede haber un problema con la "
+"red. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Error al extraer"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Ha fallado la extracción de la actualización. Puede haber un problema con la "
+"red o el servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Error de verificación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Ha fallado la verificación de la actualización. Puede haber un problema con "
+"la red o el servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autenticación"
+msgstr "Error de autenticación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Ha fallado la autenticación de la actualización. Debe haber un problema con "
+"la red o el servidor. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Descargando archivo %li de %li a %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Descargando archivo %li de %li a velocidad desconocida"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
+"más tarde."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Hubo un fallo al descargar el informe de cambios. Compruebe si tiene alguna "
-"conexión activa."
+"Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su "
+"conexión a Internet."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Muestra e instala las actualizaciones disponibles"
+msgstr "No se han podido instalar todas las actualizaciones disponibles"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -664,110 +746,101 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Algunas actualizaciones requieren la desinstalación de software. Utilice la "
+"función «Marcar todas las actualizaciones» del gestor de paquetes "
+"«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para "
+"actualizar completamente su sistema."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "Los siguientes paquetes no están actualizados: "
+msgstr "Se pasarán por alto las siguientes actualizaciones:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versión %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Descargando archivo %li de %li"
+msgstr "Descargando la lista de cambios..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Tamaño de descarga: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "¡Su sistema está actualizado!"
+msgstr "Su sistema está actualizado"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Muestra e instala las actualizaciones disponibles"
-msgstr[1] "Muestra e instala las actualizaciones disponibles"
+msgstr[0] "Puede instalar %s actualización"
+msgstr[1] "Puede instalar %s actualizaciones"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Mostrar detalles"
+msgstr "Ocultar detalles"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Mostrar detalles"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Por favor, espere; esto puede tardar un poco."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "La descarga se ha completado"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Hay cambios en los repositorios"
+msgstr "La actualización se ha completado"
 
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"La información del repositorio ha cambiado. Se guardará una copia de su "
-"sources.list en %s.save. \n"
-"\n"
-"Necesita recargar la lista de paquetes de los servidores para que sus "
-"cambios hagan efecto. ¿Quiere hacer esto ahora?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Nueva versión: %s"
+msgstr "Nueva versión: %s (Tamaño: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr "Su distribución ya no esta soportada"
+msgstr "Su distribución ya no está soportada"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"No podrá obtener nuevas correcciones de seguridad ni actualizaciones "
+"críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite http://"
+"www.ubuntu.com para más información sobre la actualización."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"Sólo se permite la ejecución simultánea de una única herramienta de gestión "
+"de software"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Por favor, cierre primero la otra aplicación (ej: «aptitude» o «Synaptic»)."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "El índice de software está dañado"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Es imposible instalar o desinstalar ningún programa. Por favor, utilice el "
+"gestor de paquetes «Synaptic», o ejecute «sudo apt-get install -f» en una "
+"terminal, para corregir este problema primero."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -784,15 +857,15 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Analizando su sistema</b></big>\n"
 "\n"
-"Las actualizaciones de software pueden corregir errores, eliminar fallos de "
-"seguridad, y proporcionar nuevas funcionalidades."
+"Las actualizaciones de software corrigen errores, eliminan fallos de "
+"seguridad y proporcionan nuevas funcionalidades."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
@@ -832,11 +905,11 @@ msgstr "Actualizaciones de software"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"Las actualizaciones de software pueden corregir errores, eliminar fallos de "
-"seguridad, y proporcionar nuevas funcionalidades."
+"Las actualizaciones de software corrigen errores, eliminan fallos de "
+"seguridad y proporcionan nuevas funcionalidades."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
@@ -897,12 +970,10 @@ msgstr "Actualizaciones por Internet"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Sólo se instalarán automáticamente las actualizaciones de seguridad que "
-"provengan de los servidores oficiales de Ubuntu. Para ello, necesita que se "
-"instale el paquete «unattended-upgrades»."
+"provengan de los servidores oficiales de Ubuntu."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -914,7 +985,7 @@ msgstr "Restaurar las claves predeterminadas de su distribución"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
-msgstr "Preferencias de software"
+msgstr "Preferencias del software"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
@@ -962,9 +1033,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Componentes:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Componentes:</b>"
+msgstr "<b>Componentes</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -983,13 +1053,13 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Introduzca la línea completa de APT del canal que quiere añadir</b></"
+"<big><b>Introduzca la línea APT completa del canal que quiere añadir</b></"
 "big>\n"
 "\n"
-"La línea de APT contiene el tipo, ubicación y contenido de un repositorio, "
+"La línea APT contiene el tipo, la ubicación y los componentes de un canal, "
 "por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
@@ -1042,10 +1112,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Comprobar automáticamente si se encuentra disponible una nueva versión de la "
+"distribución actual, y proponer su actualización (si es posible)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Comprobar si existen nuevas publicaciones de la distribución"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1082,13 +1154,12 @@ msgid "The window size"
 msgstr "El tamaño de la ventana"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Comprobar si hay nuevas actualizaciones en los canales de software"
+msgstr "Configura canales de software y actualizaciones por Internet"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
-msgstr "Propiedades de software"
+msgstr "Propiedades del software"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
@@ -1202,6 +1273,23 @@ msgstr "Software compatible con la DFSG con dependencias no libres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Cuando se exploraba la información de su repositorio, se encontró una "
+#~ "entrada no válida para la actualización.\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Hay cambios en los repositorios"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Necesita recargar la lista de paquetes desde los servidores para que sus "
+#~ "cambios tengan efecto. ¿Quiere hacer esto ahora?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Secciones</b>"
 
diff --git a/po/fi.po b/po/fi.po
index c71b2e7c..bc43334e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-10 07:26+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-29 08:32+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Päivittäin"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Joka toinen päivä"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Viikottain"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Joka toinen viikko"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "%s päivän välein"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Viikon jälkeen"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Kahden viikon jälkeen"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Kuukauden jälkeen"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -105,7 +133,7 @@ msgstr ""
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
-msgstr "Tapahtui virhe varmennettaessa joitain paketteja"
+msgstr "Joitain paketteja todennettaessa tapahtui virhe"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
 msgid ""
@@ -113,21 +141,21 @@ msgid ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
-"Joitain paketteja ei voitu varmentaa. Tämä voi olla ohimenevä verkko-"
-"ongelma. Voit yrittää myöhemmin uudelleen. Alla on luettelo "
-"varmentamattomista paketeista."
+"Joitain paketteja ei voitu todentaa. Tämä voi olla ohimenevä verkko-ongelma. "
+"Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista "
+"paketeista."
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Ei voitu asentaa pakettia '%s'"
+msgstr "Ei voitu asentaa pakettia \"%s\""
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheilmoitus. "
+"Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
@@ -152,23 +180,53 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Luetaan kätköä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Ei löytynyt kelpoa ohjelmavarastomerkintää"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Ei löytynyt sopivaa palvelinta"
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+"Ohjelmavarastotietoja tarkistettaessa ei löydetty sopivaa palvelinmerkintää "
+"päivitystä varten. Tämä voi tapahtua jos käytät sisäistä peilipalvelinta tai "
+"palvelintiedot ovat vanhentuneita.\n"
+"\n"
+"Haluatko uudelleenkirjoittaa \"sources.list\"-tiedoston joka tapauksessa? "
+"Jos valitset \"Kyllä'\", kaikki \"%s\"-merkinnät muutetaan \"%s\"-"
+"merkinnöiksi.\n"
+"Jos valitset \"Ei\", päivitys keskeytyy."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Luo ja ota käyttöön oletusohjelmalähteet?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Luettaessa varastotietoja ei löydetty kelvollisia ohjelmavarastoja "
-"päivittämistä varten.\n"
+"\"sources.list\"-tiedostosta ei löytynyt sopivaa merkintää \"%s\":lle.\n"
+"\n"
+"Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys "
+"keskeytyy."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Virhe ohjelmavarastotiedoissa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -176,11 +234,25 @@ msgstr ""
 "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita "
 "tästä virheraportilla."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Jotkin kolmannen osapuolen lähteet sources.list-tiedostossa ovat nyt poissa "
+"käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen \"ohjelma-"
+"asetukset\"-työkalulla tai Synaptic-ohjelmalla."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Virhe päivitettäessä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -188,11 +260,11 @@ msgstr ""
 "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. "
 "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Levytilaa ei ole riittävästi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -203,28 +275,27 @@ msgstr ""
 "poista aiempien asennusten väliaikaiset pakettitiedostot käyttämällä "
 "komentoa 'sudo apt-get clean'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Haluatko aloittaaa päivityksen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Ei voitu asentaa päivityksiä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. "
-"Korjaustoimenpiteet käynnistetään (dpkg --configure -a)."
+"Korjaustoimenpiteet suoritettiin (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr "Ei voitu ladata päivityksiä"
+msgstr "Päivityksiä ei voitu noutaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -232,23 +303,23 @@ msgstr ""
 "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. "
 "CD) toiminta ja yritä uudelleen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Poista vanhentuneet paketit?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Ohita tämä kohta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Virhe suoritettaesa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -258,65 +329,69 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Tarkistetaan pakettienhallintaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Päivitetään ohjelmavarastotietoja"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Vialliset pakettitiedot"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Pakettitietojen päivitysten jälkeen pakollista ohjelmapakettia \"%s\" ei "
+"enää löydetty.\n"
+"Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Pyydetään vahvistusta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Päivitetään"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Etsitään vanhetuneita ohjelmia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Järjestelmän päivitys on valmis."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Laita '%s' asemaan '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Lataus on valmis"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr "Ladataan tiedostoa %li/%li nopeudella %s/s"
+msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s jäljellä"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Noudetaan tiedostoa %li/%li"
@@ -324,21 +399,21 @@ msgstr "Noudetaan tiedostoa %li/%li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Toteutetaan muutoksia"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Ei voituu asentaa: '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -347,81 +422,80 @@ msgstr ""
 "Korvataanko asetustiedosto\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Komentoa 'diff' ei löytynyt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Vakava virhe tapahtui"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot ~/dist-upgrade."
-"log ja ~/dist-upgrade-apt.log. Päivitys keskeytyy nyt. "
+"Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot /var/log/dist-"
+"upgrade.log ja /var/log/dist-upgrade-apt.log. Päivitys keskeytyy nyt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s paketti poistetaan"
 msgstr[1] "%s pakettia poistetaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s uusi paketti asennetaan"
 msgstr[1] "%s uutta pakettia asennetaan"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s paketti päivitetään"
 msgstr[1] "%s pakettia päivitetään"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
-msgstr "Ladattavaa yhteensä %s."
+msgstr "Noudettavaa yhteensä %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Päivityksiä ei löytynyt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Järjestelmäsi on jo päivitetty."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Poista %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Asenna %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Päivitä %s"
@@ -472,7 +546,7 @@ msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Päivitetään versioon: Ubuntu \"Dapper"
+"<span weight=\"bold\" size=\"x-large\">Päivitetään jakeluun: Ubuntu \"Dapper"
 "\" 6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -489,7 +563,7 @@ msgstr "Tiedostojen väliset erot"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr "Ladataan ja asennetaan päivityksiä"
+msgstr "Noudetaan ja asennetaan päivityksiä"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -532,119 +606,120 @@ msgid "_Resume Upgrade"
 msgstr "_Jatka päivitystä"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Päivityksiä ei löytynyt"
+msgstr "Julkaisutietoja ei löytynyt"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Palvelin voi olla ylikuormitettu. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Ei voitu ladata päivityksiä"
+msgstr "Ei voitu noutaa julkaisutietoja"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Tarkista Internet-yhteytesti toimivuus."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Ei voitu asentaa päivityksiä"
+msgstr "Ei voitu suorittaa päivitystyökalua"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Tehtäessä päivitykseen liittyviä tarkistuksia tapahtui virhe jota ei voitu "
-"korjata. Ilmoita tästä virheraportilla. "
+"Tämä on luultavasti ohjelmavirhe päivitystyökalussa. Ilmoita tästä "
+"virheraportilla."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Ladataan ja asennetaan päivityksiä"
+msgstr "Ladataan päivitystyökalua"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Päivitystyökalu ohjaa päivityksen suorittamisessa."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Päivitä työkalun allekirjoitus"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Päivitä %s"
+msgstr "Päivitä työkalu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Ei voitu noutaa"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Päivityksen noutaminen epäonnistui. Tämä voi johtua verkko-ongelmasta. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Ei voitu purkaa"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Päivityksen purkaminen epäonnistui. Tämä voi johtua ongelmasta "
+"verkkoyhteydessä tai palvelimessa. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Tarkistus epäonnistui"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta "
+"verkkoyhteydessä tai palvelimessa. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Varmennus"
+msgstr "Todennus epäonnistui"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Päivityksen todennus epäonnistui. Tämä voi johtua ongelmasta "
+"verkkoyhteydessä tai palvelimessa. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "Ladataan tiedostoa %li/%li nopeudella %s/s"
+msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Ladataan tiedostoa %li/%li tuntemattomalla nopeudella"
+msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
-msgstr "Muutosten lataus epäonnistui. Tarkista, että Internet-yhteys toimii."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr ""
+"Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Näytä ja asenna saatavilla olevat päivitykset"
+msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -652,110 +727,97 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse "
+"kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai "
+"suorita päätteessä komento \"sudo apt-get dist-upgrade\"."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "Seuraavia paketteja ei päivitetä: "
+msgstr "Seuraavat päivitykset ohitetaan:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versio: %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Noudetaan tiedostoa %li/%li"
+msgstr "Noudetaan muutosluetteloa..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "%s täytyy noutaa"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Järjestelmäsi on ajan tasalla!"
+msgstr "Järjestelmäsi on ajan tasalla"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Näytä ja asenna saatavilla olevat päivitykset"
-msgstr[1] "Näytä ja asenna saatavilla olevat päivitykset"
+msgstr[0] "Voit asentaa %s päivityksen"
+msgstr[1] "Voit asentaa %s päivitystä"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Näytä yksityiskohdat"
+msgstr "Piilota yksityiskohdat"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Näytä yksityiskohdat"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Odota, tämä voi kestää jonkun aikaa."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Lataus on valmis"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Varastot muuttuneet"
+msgstr "Päivitys on valmis"
 
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Varastotiedoissa on muutoksia. Varmuuskopio tiedostosta sources.list on "
-"tallennettu nimellä %s.save. \n"
-"\n"
-"Ohjelmapakettien luettelo täytyy ladata uudelleen palvelimelta, jotta "
-"muutoksesi tulevat voimaan. Haluatko tehdä tämän nyt?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Uusi versio: %s"
+msgstr "Uusi versio: %s (koko: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr "Jakeluasi ei enää tueta"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Et saa enää turvallisuuspäivityksiä tai muita kriittisiä päivityksiä. "
+"Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja "
+"päivittämisestä osoitteesta http://www.ubuntu.com/"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Vain yksi pakettienhallintatyökalu voi olla kerralla käytössä"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-msgstr ""
+msgstr "Sulje ensin toinen ohjelma, kuten \"aptitude\" tai \"Synaptic\"."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Ohjelmaluettelo on rikkinäinen"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Mitään ohjelmia ei voida asentaa tai poistaa. Korjaa ongelma käyttämällä "
+"Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" "
+"päätteessä."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -771,15 +833,15 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"<big><b>Tarkistetaan saatavilla olevia päivityksiä</b></big>\n"
+"<big><b>Tarkistetaan järjestelmää</b></big>\n"
 "\n"
-"Ohjelmapäivitykset voivat korjata virheitä ja turva-aukkoja tai tarjota "
-"uusia ominaisuuksia."
+"Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia "
+"ominaisuuksia."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
@@ -787,7 +849,7 @@ msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr "Peruuta _lataus"
+msgstr "Peruuta _nouto"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
@@ -819,11 +881,11 @@ msgstr "Ohjelmapäivitykset"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"Ohjelmapäivitykset voivat korjata virheitä ja turva-aukkoja tai tarjota "
-"uusia ominaisuuksia."
+"Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia "
+"ominaisuuksia."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
@@ -835,7 +897,7 @@ msgstr "Päivitä Ubuntun viimeisimpään versioon"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr "_Check"
+msgstr "_Tarkista"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
@@ -863,11 +925,11 @@ msgstr "Lisää _CD"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
-msgstr "Varmennus"
+msgstr "Todennus"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr "_Poista ladatut ohjelmatiedostot:"
+msgstr "_Poista noudetut ohjelmatiedostot:"
 
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
@@ -884,12 +946,10 @@ msgstr "Internet-päivitykset"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Vain turvallisuuspäivitykset virallisilta Ubuntu-palvelimilta asennetaan "
-"automaattisesti. Ohjelmapaketti \"unattented-upgrades\" tulee sen takia "
-"asentaa."
+"automaattisesti."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -901,7 +961,7 @@ msgstr "Palauta jakelusi oletusavaimet"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
-msgstr "Asetukset"
+msgstr "Ohjelma-asetukset"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
@@ -909,7 +969,7 @@ msgstr "_Tarkista päivitykset automaattisesti:"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
-msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä"
+msgstr "_Nouda päivitykset taustalla, mutta älä asenna niitä"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
@@ -948,9 +1008,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Komponentit:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Komponentit:</b>"
+msgstr "<b>Komponentit</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -969,7 +1028,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Kirjoita haluamasi kanavan koko APT-rivi</b></big>\n"
@@ -1027,10 +1086,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Tarkista automaattisesti, onko jakelusta saatavilla uudempaa versiota ja "
+"tarjoa päivitystä (jos mahdollista)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Tarkista onko uusia julkaisuja jakelusta"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1059,20 +1120,19 @@ msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
-"Tallentaa muutoslistan ja kuvauksen näyttämän ikkunalaajennoksen tilan."
+"Tallentaa muutosluettelon ja kuvauksen näyttämän ikkunalaajennoksen tilan."
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "Ikkunan koko"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Tarkista onko ohjelmakanavissa uusia päivityksiä"
+msgstr "Muokkaa ohjelmakanavia ja Internet-päivitysten asetuksia"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
-msgstr "Asetukset"
+msgstr "Ohjelma-asetukset"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
@@ -1187,6 +1247,23 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmat"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Luettaessa varastotietoja ei löydetty kelvollisia ohjelmavarastoja "
+#~ "päivittämistä varten.\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Varastot muuttuneet"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Ohjelmapakettien luettelo täytyy ladata uudelleen palvelimilta, jotta "
+#~ "muutoksesi tulevat voimaan. Haluatko tehdä tämän nyt?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Osastot</b>"
 
diff --git a/po/fr.po b/po/fr.po
index b89df424..a14465f6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,20 +8,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-10 09:41+0000\n"
-"Last-Translator: benje <benhaim_jerome@yahoo.fr>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-01 20:10+0000\n"
+"Last-Translator: Benoît Turpin <benoit.turpin@centrale-lyon.net>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Quotidiennement"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Tous les deux jours"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Hebdomadaire"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Toutes les deux semaines"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Tous les %s jours"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Après une semaine"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Après deux semaines"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Après un mois"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -33,7 +61,7 @@ msgstr "Importer la clé"
 
 #: ../SoftwareProperties/SoftwareProperties.py:432
 msgid "Error importing selected file"
-msgstr "Erreur lors du chargement du fichier sélectionné"
+msgstr "Erreur lors de l'importation du fichier sélectionné"
 
 #: ../SoftwareProperties/SoftwareProperties.py:433
 msgid "The selected file may not be a GPG key file or it might be corrupt."
@@ -48,8 +76,8 @@ msgstr "Erreur lors de la suppression de la clé"
 #: ../SoftwareProperties/SoftwareProperties.py:446
 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ée. Veuillez envoyer "
-"ceci comme étant un bogue."
+"La clé que vous avez sélectionnée ne peut être supprimée. Veuillez rapporter "
+"ce bogue."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -68,7 +96,7 @@ msgstr "Veuillez saisir un nom pour le disque"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr "Veuillez insérer un disque dans le lecteur:"
+msgstr "Veuillez insérer un disque dans le lecteur :"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
@@ -80,7 +108,7 @@ msgid ""
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
 "Votre système contient des paquets défectueux qui n'ont pu être réparés avec "
-"ce logiciel. Veuillez d'abord les réparer à l'aide de synaptic ou d'apt-get "
+"ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get "
 "avant de continuer."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
@@ -101,8 +129,8 @@ msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Un problème insoluble est apparu lors du calcul de la mise à jour. Merci de "
-"signaler ce bogue. "
+"Un problème insoluble est apparu lors du calcul de la mise à jour. Merci "
+"rapporter ce bogue. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
@@ -129,8 +157,8 @@ msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Il a été impossible d'installer un paquet pourtant requis. Merci de signaler "
-"ce bogue. "
+"Il a été impossible d'installer un paquet pourtant requis. Merci de "
+"rapporter ce bogue. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
@@ -145,9 +173,9 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Votre système ne contient pas un paquet ubuntu-desktop, kubuntu-desktop ou "
-"edubuntu-desktop, et il n'a par conséquent pas été possible de détecter "
-"quelle version d'Ubuntu vous utilisez.\n"
+"Votre système ne contient pas de paquet ubuntu-desktop, kubuntu-desktop ou "
+"edubuntu-desktop, et il n'a par conséquent pas été possible de détecter la "
+"version d'Ubuntu que vous utilisez.\n"
 " Veuillez d'abord installer l'un des paquets ci-dessus, en utilisant "
 "Synaptic ou apt-get, avant de continuer."
 
@@ -155,48 +183,93 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Lecture du cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Aucune entrée valide trouvée"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Aucun mirroir valide n'a pu être trouvé"
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+"Aucune entrée de mirroir pour la mise à jour n'a été trouvée lors de "
+"l'examen des informations de votre dépôt. Ceci peut se produire lorsque vous "
+"utilisez un mirroir interne ou si les informations du mirroir sont "
+"obsolètes.\n"
+"\n"
+"Souhaitez-vous que votre « sources.list'» soit malgré tout réécrit ? Si oui, "
+"cela mettra à jour « %s » des « %s » entrées.\n"
+"Sinon, la mise à jour sera annulée."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Générer les sources par défaut ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Durant la vérification des informations du dépôt, aucune entrée valide pour "
-"la mise à jour n'a été trouvée.\n"
+"Après analyse de votre « sources.list », aucune entrée valide pour « %s » "
+"n'est pu être trouvée.\n"
+"\n"
+"Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous "
+"sélectionnez « Non », la mise à jour sera annulée."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
-msgstr "Information sur le dépôt invalide"
+msgstr "Informations sur le dépôt invalides"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
-"La mise à jour des informations du dépôt a créé un fichier invalide. "
-"Veuillez rapporter ceci en tant que bogue."
+"La mise à jour des informations du dépôt a créé un fichier invalide. Merci "
+"de rapporter ce bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Sources provenant de tiers désactivées"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Certaines entrées de votre sources.list provenant de tiers ont été "
+"désactivées. Vous pouvez les réactiver après la mise à jour avec l'outil « "
+"Préférences du logiciel » ou avec Synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Erreur lors de la mise à jour"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 "Un problème est survenu lors de la mise à jour. Ceci est généralement dû à "
-"un problème quelconque du réseau. Veuillez vérifier votre connexion au "
-"réseau et réessayer."
+"un problème de réseau. Veuillez vérifier votre connexion au réseau et "
+"réessayer."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Il n'y a pas assez d'espace libre sur le disque"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -205,55 +278,53 @@ msgid ""
 msgstr ""
 "La mise à jour vient d'échouer. Veuillez libérer au moins %s d'espace "
 "disque. Videz votre corbeille et supprimez les paquets temporaires des "
-"installations précédentes en utilisant 'sudo apt-get clean'."
+"installations précédentes en utilisant « sudo apt-get clean »."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Voulez-vous commencer la mise à jour ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Les mises à jour n'ont pu être installées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
-"La mise à jour abandonne maintenant. Votre système pourrait être dans un "
-"état inutilisable. Veuillez essayer \"sudo apt-get install -f\" ou utilisez "
-"synaptic pour réparer votre système."
+"Abandon de la mise à jour. Votre système est peut-être inutilisable. Une "
+"recupération a été lancée (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Les mises à jour n'ont pu être téléchargées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"La mise a jour a été abandonnée maintenant. Veuillez vérifier votre "
-"connexion Internet ou votre médium d'installation, et réessayez. "
+"Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou "
+"votre médium d'installation puis réessayez. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Enlever les paquets obsolètes ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Passer cette étape"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Erreur pendant la soumission"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -263,65 +334,70 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Vérification du gestionnaire de paquets"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Mise à jour des informations sur les dépôts en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Informations de paquet invalides"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Après la mise à jour des informations de votre paquet, le paquet « %s », "
+"pourtant requis, n'a pu être trouvé.\n"
+"Ceci est indique qu'une erreur important s'est produite, veuillez rapporter "
+"ce bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Demande de confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Mise à jour en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr "Recherche de logiciels désuets"
+msgstr "Recherche de logiciels obsolètes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "La mise à jour du système est terminée."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Veuillez insérer « %s » dans le lecteur « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Le téléchargement est terminé"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Téléchargement du fichier %li sur %li à %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s restants"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Téléchargement du fichier %li sur %li"
@@ -329,106 +405,108 @@ msgstr "Téléchargement du fichier %li sur %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Application des changements"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Impossible d'installer \"%s\""
+msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "La mise à jour vient d'échouer. Merci de signaler ce bug."
+msgstr "La mise à jour vient d'échouer. Merci de rapporter ce bog.ue"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 "Remplacer le fichier de configuration\n"
-"'%s' ?"
+"« %s » ?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
-msgstr "La commande 'diff' n'a pas été trouvée"
+msgstr "La commande « diff » n'a pu être trouvée"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Une erreur fatale est survenue"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Veuillez signaler ce bogue et joindre les fichiers ~/dist-upgrade.log et ~/"
-"dist-upgrade-apt.log à votre rapport. La mise à jour s'annule maintenant. "
+"Veuillez signaler ce bogue et joindre les fichiers /var/log/dist-upgrade.log "
+"et /var/log/dist-upgrade-apt.log à votre rapport. La mise à jour est "
+"annulée.\n"
+"Votre sources.list d'origine a été sauvé dans /etc/apt/source.list."
+"distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "Le paquet %s va être supprimé."
 msgstr[1] "Les paquets %s vont être supprimés."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "Le paquet %s va être installé."
 msgstr[1] "Les paquets %s vont être installés."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "Le paquet %s va être mis à jour."
 msgstr[1] "Les paquets %s vont être mis à jour."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Vous devez télécharger un total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
-"La mise à niveau peut prendre plusieurs heures et ne peut pas être annulée "
-"plus tard."
+"La mise à jour peut prendre plusieurs heures et ne peut être annulée "
+"ultérieurement."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les "
-"applications ou documents ouverts."
+"applications et documents ouverts."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Aucune mise à jour n'est disponible"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Votre système a déjà été mis à jour."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Supprimer %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Installer %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Mettre à jour %s"
@@ -442,7 +520,7 @@ msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
 "La mise à jour est terminée et le redémarrage de l'ordinateur est requis. "
-"Voulez-vous le faire dès maintenant?"
+"Voulez-vous y procéder maintenant ?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -460,7 +538,7 @@ msgid ""
 "The system could be in an unusable state if you cancel the upgrade. You are "
 "strongly adviced to resume the upgrade."
 msgstr ""
-"<b><big>Annuler la mise à jour en cours?</big></b>\n"
+"<b><big>Annuler la mise à jour en cours ?</big></b>\n"
 "\n"
 "Le système pourrait devenir inutilisable si vous annulez la mise à jour. Il "
 "vous est fortement conseillé de reprendre la mise à jour."
@@ -479,7 +557,7 @@ msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu \"Dapper\" "
+"<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu Dapper Drake "
 "6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -500,7 +578,7 @@ msgstr "Téléchargement et installation des mises à jour"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Modification des canaux du logiciel"
+msgstr "Modification des dépôts de logiciels"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
@@ -539,121 +617,124 @@ msgid "_Resume Upgrade"
 msgstr "_Reprendre la mise à jour"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Aucune mise à jour n'est disponible"
+msgstr "Impossible de trouver les informations de version"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Le serveur est peut-être surchargé. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Les mises à jour n'ont pu être téléchargées"
+msgstr "Impossible de télécharger les informations de version"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Veuillez vérifier votre connexion Internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Les mises à jour n'ont pu être installées"
+msgstr "Impossible de lancer l'outil de mise à jour"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Un problème insoluble est apparu lors du calcul de la mise à jour. Merci de "
-"signaler ce bogue. "
+"rapporter ce bogue."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Téléchargement et installation des mises à jour"
+msgstr "Téléchargement de l'outil de mise à jour"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Cet outil vous guidera à travers le processus de mise à jour"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Signature de l'outil de mise à jour"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Mettre à jour %s"
+msgstr "Outil de mise à jour"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Impossible d'établir la connexion"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"La recherche de la mise à jour à échoué. Il y a peut-être un problème "
+"réseau. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Impossible d'extraire"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"L'extraction de la mise à jour a échoué. Il y a peut-être un problème de "
+"réseau ou avec le serveur. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Échec de la vérification"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"La vérification de la mise à jour à échoué. Il y a peut-être un problème "
+"avec le réseau ou avec le serveur. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Authentification"
+msgstr "Échec de l'authentification"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Échec de l'authentification de la mise à jour. Il y a peut-être un problème "
+"avec le réseau ou avec le serveur "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Téléchargement du fichier %li sur %li à %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"La liste des modifications n'est pas encore disponible. Veuillez réessayer "
+"plus tard."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Échec du téléchargement des changements. Veuillez vérifier que votre "
-"connexion internet est activée."
+"Échec du téléchargement de la liste des modifications. Veuillez vérifier que "
+"votre connexion Internet est activée."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Afficher et installer les mises à jour disponibles"
+msgstr "Impossible d'installer toutes les mises à jour disponibles"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -661,110 +742,99 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Certaines mises à jour requièrent la suppression de logiciels "
+"supplémentaires. Utilisez la fonction « Sélectionner la totalité des mises à "
+"jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo apt-get dist-"
+"upgrade » dans un terminal pour mettre votre système complètement à jour."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "Les paquets suivants ne seront pas mis à jour : "
+msgstr "Les paquets suivants ne seront pas mis à jour :"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr "Version %s : \n"
+msgstr "Version %s : \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Téléchargement du fichier %li sur %li"
+msgstr "Téléchargement de la liste des nouveautés"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Taille du téléchargement : %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Votre système est à jour !"
+msgstr "Votre système est à jour"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Afficher et installer les mises à jour disponibles"
-msgstr[1] "Afficher et installer les mises à jour disponibles"
+msgstr[0] "Vous pouvez installer %s mise à jour"
+msgstr[1] "Vous pouvez installer %s mises à jour"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Montrer les détails"
+msgstr "Masquer les détails"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Montrer les détails"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Veuillez patienter, cela peut prendre du temps."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Le téléchargement est terminé"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Les dépôts ont été modifiés"
+msgstr "La mise à jour est terminée"
 
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Les informations des dépôts ont changés. Une sauvegarde de votre sources."
-"list à été copiée à %s.save. \n"
-" \n"
-"Vous devez recharger la liste des paquets depuis les serveurs pour que vos "
-"changements soient effectifs. Voulez-vous le faire maintenant ?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Nouvelle version : %s"
+msgstr "Nouvelle version : %s (taille : %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr "Votre distribution n'est plus supportée"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Vous ne pouvez plus obtenir de mises à jour critiques ou de securité . Vous "
+"devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur "
+"http://www.ubuntu.com pour de plus amples informations à ce sujet."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Vous ne pouvez utilisez qu'un seul gestionnaire de logiciels à la fois"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Veuillez fermer l'autre application, e.g. « Aptitude » ou « Synaptic »."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "La liste des logiciels est corrompue"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Il est impossible d'installer ou de supprimer des logiciels. Veuillez "
+"utiliser d'abord le « Gestionnaire de paquets Synaptic » ou lancez « sudo "
+"apt-get install -f » dans un terminal pour réparer ce problème."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -776,17 +846,16 @@ msgstr ""
 "<b><big>Vous devez vérifier manuellement la disponibilité de mises à jour</"
 "big></b>\n"
 "\n"
-"Votre système ne contrôle pas les mises à jour automatiquement. Vous pouvez "
-"configurer ce comportement dans \"Système\" -> \"Administration\" -> "
-"\"Propriété des programmes\""
+"Votre système ne vérifie pas les mises à jour automatiquement. Vous pouvez "
+"configurer ce comportement dans « Système » -> « Administration » -> « "
+"Propriété des programmes »"
 
 #: ../data/UpdateManager.glade.h:4
-#, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Recherche de mises à jour pour votre système</b></big>\n"
 "\n"
@@ -810,9 +879,8 @@ msgid "Chec_k"
 msgstr "_Vérifier"
 
 #: ../data/UpdateManager.glade.h:11
-#, fuzzy
 msgid "Check the software channels for new updates"
-msgstr "Vérifie les mises à jour de logiciels"
+msgstr "Vérifier les dépôts pour de nouvelles mises à jour logiciels"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -832,8 +900,8 @@ msgstr "Mises à jour des logiciels"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des "
 "problèmes de sécurité et apporter de nouvelles fonctionalités."
@@ -860,7 +928,7 @@ msgstr "_Installer les mises à jour"
 
 #: ../data/SoftwareProperties.glade.h:1
 msgid "<b>Channels</b>"
-msgstr "<b>Canaux</b>"
+msgstr "<b>Dépôts</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
 msgid "<b>Internet updates</b>"
@@ -898,12 +966,10 @@ msgstr "Mises à jour par Internet"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Seules les mises à jour de sécurité des serveurs officiels d'Ubuntu seront "
-"automatiquement installées. Les autres mises à jour \"innatendues\" de "
-"logiciels devront être installées manuellement."
+"automatiquement installées."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -911,7 +977,7 @@ msgstr "Restaurer les clés par _défaut"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr "Restaurer les clés par défaut pour votre distribution"
+msgstr "Restaurer les clés par défaut de votre distribution"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -919,7 +985,7 @@ msgstr "Préférences du logiciel"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr "_Rechercher des mises à jour automatiquement:"
+msgstr "_Rechercher des mises à jour automatiquement :"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
@@ -943,10 +1009,10 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Les informations des canaux sont obsolètes</big></b>\n"
+"<b><big>Les informations des dépôts sont obsolètes</big></b>\n"
 "\n"
-"Vous devez recharger les informations des canaux pour installer de nouveaux "
-"logiciels ou des mises à jour à partir des canaux modifiés ou nouvellement "
+"Vous devez recharger les informations des dépôts pour installer de nouveaux "
+"logiciels ou des mises à jour à partir des dépôts modifiés ou nouvellement "
 "ajoutés.\n"
 "\n"
 "Vous devez disposer d'une connexion fonctionnelle à Internet avant de "
@@ -954,7 +1020,7 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
-msgstr "<b>Canal</b>"
+msgstr "<b>Dépôt</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
@@ -965,9 +1031,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Composants :</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Composants :</b>"
+msgstr "<b>Composants</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -986,15 +1051,14 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez ajouter</"
 "b></big>\n"
 "\n"
 "La ligne APT contient le type, la source et le contenu d'un dépôt, par "
-"exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une "
-"description détaillée de la syntaxe dans la documentation."
+"exemple <i> « deb http://ftp.debian.org sarge main »</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -1002,7 +1066,7 @@ msgstr "Ligne APT :"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr "Ajouter un canal"
+msgstr "Ajouter un dépôt"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -1018,16 +1082,16 @@ msgstr "Modifier un dépôt"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr "Examen du cédérom"
+msgstr "Examen du CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 #, fuzzy
 msgid "_Add Channel"
-msgstr "_Ajouter un canal"
+msgstr "_Ajouter un dépôt"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr "_Personnalisé"
+msgstr "_Personnaliser"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 msgid "_Reload"
@@ -1046,10 +1110,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Vérifier automatiquement si une nouvelle version de l'actuelle distribution "
+"est disponible et proposer la mise à jour (si possible)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Vérifier les nouvelles versions de la distribution"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1078,17 +1144,16 @@ msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
-"Enregistre l'état de l'extendeur contenant la liste des changements et la "
-"description"
+"Enregistre l'état de développement de la liste des changements et des "
+"descriptions"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "La taille de la fenêtre"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Vérifie les mises à jour de logiciels"
+msgstr "Configurer les dépôts de paquets et les mises à jour via Internet"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1103,7 +1168,7 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../channels/Ubuntu.info.in:6
 msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu Dapper Drake 6.06"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
@@ -1118,27 +1183,27 @@ msgstr "Mises à jour pour Ubuntu 6.06"
 #. Description
 #: ../channels/Ubuntu.info.in:57
 msgid "Ubuntu 6.06 Backports"
-msgstr "\"Backports\" pour Ubuntu 6.06"
+msgstr "« Backports » pour Ubuntu 6.06"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu Breezy Badger 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Mises à jour de sécurité d' Ubuntu 5.10"
+msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
-msgstr "Mises à jour d'Ubuntu 5.10"
+msgstr "Mises à jour pour Ubuntu 5.10"
 
 #. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
-msgstr "Backports d'Ubuntu 6.06"
+msgstr "« Backports » pour Ubuntu 6.06"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
@@ -1169,7 +1234,7 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian « Sarge » 3.1"
 
 #. BaseURI
 #: ../channels/Debian.info.in:19
@@ -1179,12 +1244,12 @@ msgstr "http://security.debian.org/"
 #. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Mises à jour de sécurité de Debian 3.1 \"Sarge\""
+msgstr "Mises à jour de sécurité pour Debian « Sarge » 3.1"
 
 #. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian « Etch » (en test)"
 
 #. BaseURI
 #: ../channels/Debian.info.in:47
@@ -1194,20 +1259,37 @@ msgstr "http://http.us.debian.org/debian/"
 #. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian \"Sid\" (instable)"
+msgstr "Debian « Sid » (instable)"
 
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 "Logiciel libre (selon les lignes directrices du projet Debian) dont les "
-"dépendances ne sont pas libre"
+"dépendances ne sont pas libres"
 
 #. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Durant la vérification des informations du dépôt, aucune entrée valide "
+#~ "pour la mise à jour n'a été trouvée.\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Les dépôts ont été modifiés"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que "
+#~ "vos changements soient effectifs. Voulez-vous le faire maintenant ?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Catégories :</b>"
 
diff --git a/po/gl.po b/po/gl.po
index ee3bfbc6..e6498493 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:23+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:30+0000\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,40 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Detalles</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -143,42 +172,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Erro ao quitar a clave"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -186,47 +246,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -234,21 +294,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Xa hai outro xestor de paquetes en execución"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -256,45 +316,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualización rematada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -302,17 +362,17 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Descargando cambios..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
@@ -320,83 +380,83 @@ msgstr ""
 "erro."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -526,7 +586,7 @@ msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro. "
+"erro."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -601,7 +661,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión "
 "activa."
@@ -623,92 +684,82 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versión %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Descargando cambios"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Descargando cambios"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Instalando actualizacións..."
 msgstr[1] "Instalando actualizacións..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Detalles</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "A súa distribución xa non está soportada"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -725,10 +776,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -769,8 +820,8 @@ msgstr "Actualizacións de software"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -837,8 +888,7 @@ msgstr "<b>Actualizacións por Internet</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -919,7 +969,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Introduza a liña completa do repositorio APT que quere engadir</b></"
diff --git a/po/he.po b/po/he.po
index fcab1e13..925a4a2d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:23+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:30+0000\n"
 "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>פרטים</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "כל %s ימים"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "כל %s ימים"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -141,31 +171,62 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "שגיאה במהלך העדכון"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -173,11 +234,11 @@ msgstr ""
 "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת "
 "שלכם ונסו שנית."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "אין מספיק שטח בדיסק הקשיח"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -185,47 +246,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -233,20 +294,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -254,44 +315,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "משדרג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "שדרוג המערכת הושלם."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "ההורדה הושלמה"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s נותרו"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, fuzzy, python-format
 msgid "Downloading file %li of %li"
 msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
@@ -299,99 +360,99 @@ msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "מוריד שינויים..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -519,7 +580,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג. "
+msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -578,9 +639,9 @@ msgid ""
 msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:111
 #, fuzzy, python-format
@@ -594,7 +655,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
 
 #. print "WARNING, keeping packages"
@@ -614,93 +676,83 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "גרסה %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "מוריד שינוייים"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "מוריד שינוייים"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "המערכת שלך מעודכנת!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "מתקין עדכונים..."
 msgstr[1] "מתקין עדכונים..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>פרטים</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 #, fuzzy
 msgid "Update is complete"
 msgstr "ההורדה הושלמה"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "ההפצה שלך כבר לא נתמכת, סליחה."
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -717,10 +769,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -761,8 +813,8 @@ msgstr "עדכוני תוכנה"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -829,8 +881,7 @@ msgstr "<b>עדכוני אינטרנט</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -911,7 +962,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n"
diff --git a/po/hu.po b/po/hu.po
index 29bc1778..a93153f4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-11 20:19+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-29 13:43+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,39 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Naponta"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Kétnaponta"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Hetente"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Minden két hétben"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "%s naponta"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Egy hét után"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Két hét után"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Egy hónap után"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -150,23 +178,54 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Gyorsítótár beolvasása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Nincs érvényes bejegyzés"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "nem található érvényes tükör"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"A csomagtároló információk olvasása közben nem találtam a frissítésre "
-"vonatkozó érvényes bejegyzést.\n"
+"A lerakatinformációk elemzése során a program nem talált tükörbejegyzést a "
+"frissítéshez. Ez akkor fordulhat elő, ha belső tükröt használ, vagy a "
+"tükörinformációk elavultak.\n"
+"\n"
+"Mindenképpen újra kívánja írni a sources.list fájlt? Ha az \"Igen\" gombot "
+"választja, akkor az összes \"%s\" bejegyzés \"%s\" bejegyzéssé lesz "
+"frissítve. \n"
+"A \"Nem\" kiválasztása megszakítja a frissítést."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Alapértelmezett források ismételt előállítása?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+"A sources.list fájl elemzése után nem található érvényes bejegyzés a "
+"következőhöz: %s.\n"
+"\n"
+"Kíván alapértelmezett bejegyzéseket adni a következőhöz: %s? Ha a Nem "
+"gombott választja, a frissítés félbeszakad."
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Érvénytelen csomagtároló információ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -174,11 +233,25 @@ msgstr ""
 "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, "
 "jelentse ezt hibaként."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "A külső források letiltva"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"A sources.list néhány külső forrása le lett tiltva. Újraengedélyezheti őket "
+"a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic "
+"csomagkezelővel."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Hiba történt a frissítés közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -186,11 +259,11 @@ msgstr ""
 "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. "
 "Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Nincs elég szabad hely a merevlemezen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -201,29 +274,27 @@ msgstr ""
 "merevlemezen. Ürítse ki a kukát és távolítsa el az előző telepítésekből "
 "származó átmeneti csomagokat a 'sudo apt-get clean' parancs használatával."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Biztosan el szeretné kezdeni a frissítést?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr "A frissítések nem telepíthetőek"
+msgstr "A frissítések nem telepíthetők"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan "
-"állapotban van. Most egy helyreállítás kerül futtatásra (dpkg --configure -"
-"a)."
+"állapotban van. Egy helyreállítás került futtatásra (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr "A frissítések nem tölthetőek le"
+msgstr "A frissítések nem tölthetők le"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -231,23 +302,23 @@ msgstr ""
 "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy "
 "a telepítő médiát és próbálja újra. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Eltávolítja az elavult csomagokat?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "Ezen lé_pés kihagyása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Hiba a módosítások rögzítése közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -257,65 +328,69 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Csomagkezelő ellenőrzése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Csomagtároló információ frissítése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Érvénytelen csomaginformációk"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"A csomaginformációk frissítése után a(z) \"%s\" alapvető csomag nem "
+"található többé.\n"
+"Ez egy komoly problémát jelez, jelentse hibaként."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Megerősítés kérése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Frissítés folyamatban"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Elavult szoftverek keresése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "A rendszer frissítése befejeződött."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Helyezze be a következő médiát: '%s', ebbe a meghajtóba: '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "A letöltés befejeződött"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s van hátra"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Fájl letöltése: %li/%li"
@@ -323,21 +398,21 @@ msgstr "Fájl letöltése: %li/%li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Módosítások alkalmazása..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s' nem telepíthető"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "A frissítés félbeszakadt. Kérem, jelentse ezt hibaként."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -347,81 +422,82 @@ msgstr ""
 "\"%s\"\n"
 "konfigurációs fájlt?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "A 'diff' parancs nem található"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Végzetes hiba történt"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Kérem, jelentse ezt hibaként és a hibajelentéshez mellékelje a ~/dist-"
-"upgrade.log és ~/dist-upgrade-apt.log fájlokat. A frissítés most "
-"félbeszakad. "
+"Kérem, jelentse ezt hibaként és a hibajelentéshez mellékelje a /var/log/dist-"
+"upgrade.log és /va/log/dist-upgrade-apt.log fájlokat. A frissítés most "
+"félbeszakad.\n"
+"Az eredeti sources.list /etc/apt/sources.list.distUpgrade néven került "
+"mentésre."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s csomag el lesz távolítva."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s új csomag kerül telepítésre."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s csomag frissítve lesz."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Összes letöltendő adatmennyiség: %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet "
-"megszakítani."
+"bármikor megszakítani."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott "
 "alkalmazást és dokumentumot."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Nincs elérhető frissítés"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Az Ön rendszere már frissítve lett."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>%s eltávolítása</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "%s telepítése"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "%s frissítése"
@@ -531,118 +607,121 @@ msgid "_Resume Upgrade"
 msgstr "Frissítés _folytatása"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Nincs elérhető frissítés"
+msgstr "Nem érhetők el a kiadási megjegyzések"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "A kiszolgáló túl lehet terhelve. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "A frissítések nem tölthetőek le"
+msgstr "A kiadási megjegyzések nem tölthetők le"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Kérjük ellenőrizze az internetkapcsolatát."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "A frissítések nem telepíthetőek"
+msgstr "Nem sikerült futtatni a frissítőeszközt"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"A frissítés megtervezése közben feloldhatatlan probléma lépett fel. Kérem, "
-"jelentse ezt hibaként. "
+"Feltehetőleg ez egy hiba a frissítőeszközben. Kérem, jelentse ezt hibaként."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Frissítések letöltése és telepítése"
+msgstr "Frissítőeszköz letöltése"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "A frissítőeszköz végigvezeti Önt a frissítési folyamaton."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Frissítőeszköz aláírása"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "%s frissítése"
+msgstr "Frissítőeszköz"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "A letöltés meghiúsult"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"A frissítés letöltése meghiúsult. Lehetséges, hogy hálózati probléma áll "
+"fenn. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "A kibontás meghiúsult"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"A frissítés kibontása meghiúsult. Probléma lehet a hálózattal vagy a "
+"kiszolgálóval. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Az ellenőrzés meghiúsult"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a "
+"kiszolgálóval. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Hitelesítés"
+msgstr "Hitelesítés sikertelen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"A frissítés hitelesítése meghiúsult. Probléma lehet a hálózattal vagy a "
+"kiszolgálóval. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s"
+msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s"
+msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "A módosítások listája még nem érhető el. Próbálkozzon később."
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
+"A módosítások listájának letöltése meghiúsult. Ellenőrizze az "
+"internetkapcsolatát."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Rendelkezésre álló frissítések megjelenítése és telepítése"
+msgstr "Nem telepíthető minden rendelkezésre álló frissítés"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -650,100 +729,98 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Néhány frissítés további szoftverek eltávolítását igényli. Használja a "
+"Synaptic csomagkezelő \"Minden frissítés kijelölése\" funkcióját, vagy "
+"futtassa terminálból a \"sudo apt-get dist-upgrade\" parancsot a rendszer "
+"teljes frissítéshez."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "A következő frissítések ki lesznek hagyva:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "%s verzió: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Fájl letöltése: %li/%li"
+msgstr "Módosítások listájának letöltése..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Letöltés mérete: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "A rendszere naprakész"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Rendelkezésre álló frissítések megjelenítése és telepítése"
+msgstr[0] "%s frissítést telepíthet"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Részletek megjelenítése"
+msgstr "Részletek elrejtése"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Részletek megjelenítése"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Kis türelmet, ez eltarthat egy ideig."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "A letöltés befejeződött"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
+msgstr "A frissítés befejeződött"
 
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Új verzió: %s (Méret: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "A terjesztés már nem támogatott"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Nem fog további biztonsági javításokat vagy kritikus frissítéseket kapni. "
+"Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel kapcsolatos "
+"információkat az http://www.ubuntu.com weboldalon talál."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Csak egy szoftverkezelő eszköz futhat egyidejűleg"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Zárja be a másik alkalmazást, például az aptitude vagy Synaptic programokat."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "A szoftverindex sérült"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Lehetetlen szoftvereket telepíteni vagy törölni. Használja a Synaptic "
+"csomagkezelőt vagy futtassa a \"sudo apt-get install -f\" parancsot egy "
+"terminálban a probléma megoldása érdekében."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -761,14 +838,14 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>A rendszer elemzése</b></big>\n"
 "\n"
-"A szoftverfrissítések programhibákat javíthatnak, megszüntetik a biztonsági "
+"A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági "
 "sebezhetőségeket és új szolgáltatásokat biztosítanak."
 
 #: ../data/UpdateManager.glade.h:7
@@ -809,11 +886,11 @@ msgstr "Szoftverfrissítések"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"A szoftverfrissítések kijavítják az időközben felfedezett programhibákat, "
-"sebezhetőségeket és új szolgáltatásokat is biztosítanak Önnek."
+"A szoftverfrissítések kijavítják a programhibákat, biztonsági "
+"sebezhetőségeket és új szolgáltatásokat biztosítanak."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
@@ -874,12 +951,10 @@ msgstr "Hálózati frissítések"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
-"Mivel csak az Ubuntu szervereiről származó biztonsági frissítések kerülnek "
-"automatikusan telepítésre, telepíteni kell az \"unattended-upgrades\" "
-"csomagot is"
+"Csak az Ubuntu kiszolgálóiról származó biztonsági frissítések kerülnek "
+"automatikusan telepítésre."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -938,9 +1013,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Összetevők:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Összetevők:</b>"
+msgstr "<b>Összetevők</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -959,14 +1033,13 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Adja meg a felvenni kívánt tároló teljes APT sorát</b></big>\n"
+"<big><b>Adja meg a felvenni kívánt csatorna teljes APT sorát</b></big>\n"
 "\n"
-"Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például <i>"
-"\"deb http://ftp.debian.org sarge main\"</i>. A szintaxis részletes leírását "
-"a dokumentációban találhatja meg."
+"Az APT sor tartalmazza a csatorna típusát, helyét és összetevőit, például <i>"
+"\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -1017,10 +1090,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Az aktuális terjesztés új verziójának automatikus keresése és a frissítés "
+"felajánlása (ha lehetséges)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Új disztribúciókiadások keresése"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1057,14 +1132,12 @@ msgid "The window size"
 msgstr "Az ablak mérete"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Frissítések keresése a szoftvercsatornákon"
+msgstr "Szoftvercsatornák és internetes frissítések beállítása"
 
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Properties"
-msgstr "Szoftver beállításai"
+msgstr "Szoftvertulajdonságok"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
@@ -1177,9 +1250,3 @@ msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr "Nem DFSG-kompatibilis szoftver"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Csoportok</b>"
-
-#~ msgid "Oficially supported"
-#~ msgstr "Hivatalosan támogatott"
diff --git a/po/it.po b/po/it.po
index 51cfbae5..7601561a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,20 +9,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-12 09:37+0000\n"
-"Last-Translator: MiloCasagrande <milo_casagrande@yahoo.it>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-02 12:46+0000\n"
+"Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Ogni giorno"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Ogni due giorni"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Ogni settimana"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Ogni due settimane"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Ogni %s giorni"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Dopo una settimana"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Dopo due settimane"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Dopo un mese"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -44,7 +72,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:445
 msgid "Error removing the key"
-msgstr "Errore nell'importare la chiave"
+msgstr "Errore nel rimuovere la chiave"
 
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
@@ -59,7 +87,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"<big><b>Errore durante la lettura del CD</b></big>\n"
+"<big><b>Errore nella scansione del CD</b></big>\n"
 "\n"
 "%s"
 
@@ -82,7 +110,7 @@ msgid ""
 msgstr ""
 "Il sistema contiene pacchetti non integri che non possono essere aggiustati "
 "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get"
-"\" per aggiustarli."
+"\" per risolvere il probelma."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
@@ -102,8 +130,8 @@ msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Si è verificato un problema irrisolvibile calcolando l'aggiornamento. Per "
-"favore segnala questo evento come bug. "
+"Si è verificato un problema irrisolvibile durante il calcolo "
+"dell'aggiornamento. Notificare questo evento come bug. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
@@ -117,7 +145,7 @@ msgid ""
 "unauthenticated packages."
 msgstr ""
 "Non è stato possibile autenticare alcuni pacchetti. Questo potrebbe essere "
-"un problema di rete passeggero. Riprovare più tardi. Segue una lista di "
+"un problema di rete passeggero, riprovare più tardi. Segue una lista di "
 "pacchetti non autenticati."
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
@@ -130,8 +158,8 @@ msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Non è stato possibile installare un pacchetto richiesto. Per favore riporta "
-"questo evento come bug. "
+"Non è stato possibile installare un pacchetto richiesto. Notificare questo "
+"evento come bug. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
@@ -150,41 +178,86 @@ msgstr ""
 "edubuntu-desktop e non è stato possibile riconoscere la versione di Ubuntu "
 "in esecuzione.\n"
 " Prima di procedere, usare synaptic o apt-get per installare uno dei "
-"pacchetti menzionati."
+"pacchetti sopra menzionati."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
 msgstr "Lettura della cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Nessuna voce valida trovata."
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Non è stato trovato alcun mirror valido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"Durante la scansione delle informazioni sui repository, non è stata trovata "
-"alcuna voce valida per l'aggiornamento.\n"
+"Durante la scansione delle informazioni sui repository in uso non è strata "
+"trovata nessuna voce di mirror per l'aggiornamento. Questo può verificarsi "
+"qualora si abbia in esecuzione un mirror interno o qualora le informazioni "
+"sul mirror siano datate.\n"
+"\n"
+"Riscrivere lo stesso il proprio file «sources.list»? Scegliendo di sì, tutte "
+"le voci «%s» verranno aggiornate a «%s»\n"
+"Scegliendo di no, l'aggiornamento verrà annullato."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Generare le sorgenti predefinite?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+"Dopo la scansione del proprio file «sorces.list», non è stata trovata alcuna "
+"voce valida per «%s».\n"
+"\n"
+"Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento "
+"verrà annullato."
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Informazioni sul repository non valide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 "L'aggiornamento delle informazioni sul repository ha generato un file non "
-"valido. Per favore segnala questo evento come bug."
+"valido. Notificare questo evento come bug."
+
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Sorgenti di terze parti disabilitate"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Sono state disabilitate alcune voci di terze parti nel proprio file «sources."
+"list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo "
+"strumento «software-properties» o con synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Errore durante l'aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -192,70 +265,67 @@ msgstr ""
 "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta "
 "di problemi di rete, controllare la connessione di rete e riprovare."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
-msgstr "Spazio libero insufficiente"
+msgstr "Spazio libero su disco insufficiente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
-"L'aggiornamento viene interrotto ora. Occorre liberare almeno %s di spazio "
-"sul disco. Svuotare il cestino e rimuovere i pacchetti temporanei delle "
-"passate installazioni usando il comando \"sudo apt-get clean\"."
+"Interruzione immediata dell'aggiornamento. Occorre liberare almeno %s di "
+"spazio sul disco. Svuotare il cestino e rimuovere i pacchetti temporanei "
+"delle passate installazioni usando il comando \"sudo apt-get clean\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Iniziare l'aggiornamento?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Impossibile installare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
-"L'aggiornamento viene interrotto ora. Il sistema potrebbe essere in uno "
-"stato inutilizzabile. Verrà avviata una procedura di ripristino (dpkg --"
-"canfigure -a)."
+"Interruzione immediata dell'aggiornamento. Il sistema potrebbe trovarsi in "
+"uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -"
+"a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Impossibile scaricare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"L'aggiornamento termina ora. Controllare la connessione a internet o il "
-"supporto di installazione e riprovare. "
+"Interruzione immediata dell'aggiornamento. Controllare la connessione a "
+"internet o il supporto di installazione e riprovare. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Rimuovere i pacchetti obsoleti?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Salta questo passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Errore durante il commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -265,20 +335,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Controllo gestore dei pacchetti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Aggiornamento delle informazione sui repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Informazioni di pacchetto non valide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -286,69 +357,67 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Richiesta di conferma"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr "Ricerca software obsoleto"
+msgstr "Ricerca di software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "L'aggiornamento del sistema è stato completato."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Inserire \"%s\" nell'unità \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Scaricamento completato"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Scaricamento del file %li di %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s rimanenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
+#, python-format
 msgid "Downloading file %li of %li"
-msgstr "Sacricamneto del file %li di %li in corso"
+msgstr "Scaricamento del file %li di %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
-msgstr "Applicazione delle modifice in corso"
+msgstr "Applicazione dei cambiamenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Impossibile installare \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
-"L'aggiornamento viene interrotto ora. Segnalare questo evento come bug."
+"Interruzione immediata dell'aggiornamento. Notificare questo evento come bug."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -357,87 +426,83 @@ msgstr ""
 "Sostituire il file di configurazione\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Il comando \"diff\" non è stato trovato"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Si è verificato un errore fatale"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Segnalare questo evento come bug e includere nella segnalazione i file \"~/"
-"dist-upgrade.log\" e \"~/dist-upgrade-apt.log\". L'aggiornamento voene "
-"interrotto ora. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] "Verrà rimosso %s pacchetto."
-msgstr[1] "Verranno rimossi %s pacchetti."
+msgstr[0] "%s pacchetto sta per essere rimosso."
+msgstr[1] "%s pacchetti stanno per essere rimossi."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] "Verrà installato %s nuovo pacchetto."
-msgstr[1] "Verranno installati %s nuovi pacchetti."
+msgstr[0] "%s nuovo pacchetto sta per essere installato."
+msgstr[1] "%s nuovi pacchetti stanno per essere installati."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] "Verrà aggiornato %s pacchetto."
-msgstr[1] "Verranno aggiornati %s pacchetti."
+msgstr[0] "%s pacchetto sta per essere aggiornato."
+msgstr[1] "%s pacchetti stanno per essere aggiornati."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "È necessario scaricare un totale di %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "L'aggiornamento può richiedere diverse ore e non può essere annullato in "
 "nessun momento successivo."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Chiudere tutte le applicazioni e i documenti aperti per prevenire la perdita "
 "di dati."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Impossibile trovare aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Il sistema è già stato aggiornato."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Rimuovi %s</b>"
+msgstr "<b>Rimuovere %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
-msgstr "Installa %s"
+msgstr "Installare %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr "Aggiorna %s"
+msgstr "Aggiornare %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
@@ -478,17 +543,16 @@ msgid "<b><big>Start the upgrade?</big></b>"
 msgstr "<b><big>Avviare l'aggiornamento?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
-#, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Aggiornamento ad Ubuntu \"Dapper\" "
+"<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu \"Dapper\" "
 "6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr "Pulizia in corso"
+msgstr "Pulizia"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
@@ -500,19 +564,19 @@ msgstr "Differenze tra i file"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr "Scaricamento e installazione degli aggiornamenti in corso"
+msgstr "Scaricamento e installazione degli aggiornamenti"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Modifica i canali software"
+msgstr "Modifica dei canali software"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "Preparazione dell'aggiornamento in corso"
+msgstr "Preparazione dell'aggiornamento"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr "Riavvio del sistema in corso"
+msgstr "Riavvio del sistema"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
@@ -520,21 +584,19 @@ msgstr "Terminale"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr "Aggiornamento di Ubuntu in corso"
+msgstr "Aggiornamento di Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-#, fuzzy
 msgid "_Keep"
 msgstr "_Mantieni"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
 msgid "_Replace"
 msgstr "_Sostituisci"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
-msgstr "_Riporta bug"
+msgstr "_Notifica bug"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
@@ -542,124 +604,128 @@ msgstr "_Riavvia ora"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr "_Riprendi l'aggiornamento"
+msgstr "_Riprendi aggiornamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Impossibile trovare aggiornamenti"
+msgstr "Impossibile trovare le note di rilascio"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Il server potrebbe essere sovraccarico. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Impossibile scaricare gli aggiornamenti"
+msgstr "Impossibile scaricare le note di rilascio"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Controllare la propria connessione a internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Impossibile installare gli aggiornamenti"
+msgstr "Impossibile eseguire lo strumento di aggiornamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Si è verificato un problema irrisolvibile calcolando l'aggiornamento. Per "
-"favore segnala questo evento come bug. "
+"Questo potrebbe essere un bug nello strumento per l'aggiornamento. "
+"Notificare questo evento come un bug."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Scaricamento e installazione degli aggiornamenti in corso"
+msgstr "Scaricamento dello strumento di aggiornamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
+"Lo strumento di aggiornamento vi guiderà durante il processo di "
+"aggiornamento."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Firma dello strumento di aggiornamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Aggiorna %s"
+msgstr "Strumento di aggiornamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Prelievo fallito"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Fallito il prelievo dell'aggiornamento. Potrebbe dipendere da un problema di "
+"rete. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Estrazione fallita"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Fallita l'estrazione dell'aggiornamento. Potrebbe dipendere da un problema "
+"con la connesione di rete o con il server. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Verifica fallita"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Fallita la verifica dell'aggiornamento. Potrebbe dipendere da un problema "
+"con la connessione di rete o con il server. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autenticazione"
+msgstr "Autenticazione fallita"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Fallita l'autenticazione dell'aggiornamento. Potrebbe dipendere da un "
+"problema con la connessione di rete o con il server. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Scaricamento del file %li di %li a %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Download del file %li di %li a velocità sconosciuta"
+msgstr "Scaricamento del file %li di %li a velocità sconosciuta"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Impossibile scaricare le modifiche. Per favore controlla se c'è una "
-"connessione internet attiva."
+"Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la "
+"connessione ad internet."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Visualizza e installa gli aggiornamenti disponibili"
+msgstr "Impossibile installare tutti gli aggiornamenti disponibili"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -667,106 +733,104 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Alcuni aggiornamenti richiedono la rimozione di altri programmi. Utilizzare "
+"la funzione \"Marca tutti gli aggiornamenti\" del gestore di pacchetti "
+"\"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade\" in un "
+"terminale per aggiornare completamente il sistema."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "I seguenti aggiornamenti saranno tralasciati:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versione %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Download modifiche in corso"
+msgstr "Scaricamento dell'elenco dei cambiamenti..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Download modifiche in corso"
+msgstr "Dati da scaricare: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Il tuo sistema è aggiornato!"
+msgstr "Il sistema è aggiornato!"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Visualizza e installa gli aggiornamenti disponibili"
-msgstr[1] "Visualizza e installa gli aggiornamenti disponibili"
+msgstr[0] "È possibile installare %s aggiornamento"
+msgstr[1] "È possibile installare %s aggiornamenti"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Visualizza dettagli"
+msgstr "Nascondi dettagli"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
-msgstr "Visualizza dettagli"
+msgstr "Mostra dettagli"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Attendere, l'operazione potrebbere richiedere del tempo."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Scaricamento completato"
+msgstr "Aggiornamento completato"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Nuova versione: %s (Dimensione: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr "La tua distribuzione non è più supportata"
+msgstr "La distribuzione in uso non è più supportata"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Non si riceveranno più aggiornamenti di sicurezza o critici. Passare a una "
+"versione più aggiornata di Ubuntu Linux. Per maggiori informazioni "
+"consultare http://www.ubuntu.com"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"È consentita l'esecuzione di un solo strumento di gestione software alla "
+"volta"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Chiudere tutte le altre applicazioni come \"aptitude\" o \"Synaptic\" prima "
+"di continuare."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "L'indice dei programmi è rovinato"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Impossibile installare o rimuovere alcun programma. Utilizzare il gestore "
+"dei pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get install -f\" "
+"in un terminale per risolvere il problema."
 
 #: ../data/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -775,29 +839,27 @@ msgid ""
 msgstr ""
 "<b><big>È necessario controllare gli aggiornamenti manualmente</big></b>\n"
 "\n"
-"Il sitema non controlla automaticamente la presenza di aggiornamenti. "
-"Impostare questa funzionalità in \"Sistema\" -> \"Amministrazione\" -> "
-"\"Proprietà software\"."
+"Il controllo automatico della disponibilità di aggiornamenti non è attivo. È "
+"possibile configurare questo comportamento in \"Sistema\" -> "
+"\"Amministrazione\" -> \"Proprietà software\"."
 
 #: ../data/UpdateManager.glade.h:4
-#, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"<big><b>Controllo aggiornamenti disponibili in corso</b></big>\n"
+"<big><b>Esame del sistema</b></big>\n"
 "\n"
-"Gli aggiornamenti del software possono correggere errori, eliminare "
-"vulnerabilità di sicurezza e fornire nuove funzionalità."
+"Gli aggiornamenti software correggono errori, eliminano vulnerabilità di "
+"sicurezza ed aggiungono nuove funzionalità."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Mantenere aggiornato il sistema</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
-#, fuzzy
 msgid "Cancel _Download"
 msgstr "Annulla _scaricamento"
 
@@ -806,14 +868,12 @@ msgid "Changes"
 msgstr "Cambiamenti"
 
 #: ../data/UpdateManager.glade.h:10
-#, fuzzy
 msgid "Chec_k"
-msgstr "_Controlla"
+msgstr "_Verifica"
 
 #: ../data/UpdateManager.glade.h:11
-#, fuzzy
 msgid "Check the software channels for new updates"
-msgstr "Controlla i canali software per la presenza di aggiornamenti"
+msgstr "Verifica la presenza  di nuovi aggiornamenti nei canali software"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -821,11 +881,11 @@ msgstr "Descrizione"
 
 #: ../data/UpdateManager.glade.h:13
 msgid "Release Notes"
-msgstr "Note alla release"
+msgstr "Note di rilascio"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr "Visualizza avanzamento dei singoli file"
+msgstr "Mostra l'avanzamento dei singoli file"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
@@ -833,11 +893,11 @@ msgstr "Aggiornamenti software"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"Gli aggiornamenti software possono correggere errori, eliminare "
-"vulnerabilità di sicurezza e fornire nuove funzionalità."
+"Gli aggiornamenti software correggono errori, eliminano vulnerabilità di "
+"sicurezza ed aggiungono nuove funzionalità."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
@@ -849,23 +909,21 @@ msgstr "Aggiorna all'ultima versione di Ubuntu"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr "_Controlla"
+msgstr "_Verifica"
 
 #: ../data/UpdateManager.glade.h:21
-#, fuzzy
 msgid "_Hide this information in the future"
 msgstr "_Non mostrare più queste informazioni"
 
 #: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
-msgstr "_Installa aggiornamenti"
+msgstr "I_nstalla aggiornamenti"
 
 #: ../data/SoftwareProperties.glade.h:1
 msgid "<b>Channels</b>"
 msgstr "<b>Canali</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Aggiornamenti internet</b>"
 
@@ -875,7 +933,7 @@ msgstr "<b>Chiavi</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr "Aggiungi _CD-ROM"
+msgstr "Aggiungi C_D-ROM"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -900,21 +958,18 @@ msgstr "Aggiornamenti internet"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
-"L'installazione automatica è limitata ai soli aggiornamenti di sicurezza "
-"provenienti dai server Ubuntu ufficiali. Il pacchetto software \"unattended-"
-"upgrades\" deve perciò essere installato"
+"Solo gli aggiornamenti di sicurezza dai servers ufficiali di Ubuntu saranno "
+"installati automaticamente"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
 msgstr "Ripristina pre_definite"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr "Ripristina le chiavi predefinite della tua distribuzione"
+msgstr "Ripristina le chiavi predefinite della distribuzione in uso"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
@@ -925,13 +980,12 @@ msgid "_Check for updates automatically:"
 msgstr "_Verificare aggiornamenti automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-#, fuzzy
 msgid "_Download updates in the background, but do not install them"
 msgstr "_Scaricare gli aggiornamenti in background, ma non installarli"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr "_Installa gli aggiornamenti di sicurezza senza richiedere conferma"
+msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
@@ -948,10 +1002,10 @@ msgid ""
 msgstr ""
 "<b><big>Le informazioni sul canale non sono aggiornate</big></b>\n"
 "\n"
-"Ricaricare le informazioni sul canale per installare il software e gli "
-"aggiornamenti provenienti dai canali aggiunti o modificati. \n"
+"È necessario ricaricare le informazioni sul canale per installare software e "
+"aggiornamenti provenienti dai canali aggiunti o modificati di recente. \n"
 "\n"
-"Una connessione a internet funzionante è necessaria per continuare."
+"Per continuare è neccessaria una connessione a internet funzionante."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
@@ -962,14 +1016,12 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Commento:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
 msgid "<b>Components:</b>"
 msgstr "<b>Componenti:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Componenti:</b>"
+msgstr "<b>Componenti</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -988,14 +1040,14 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Inserire la linea APT completa del canale che si vuole aggiungere</"
+"<big><b>Inserire la riga APT completa del canale che si vuole aggiungere</"
 "b></big>\n"
 "\n"
-"La riga APT contiene il tipo, la locazione e il contenuto di un canale, ad "
-"esempio <i>\"deb http://ftp.debian.org sarge main\"</i>"
+"La riga APT include il tipo, la posizione ed i componenti di un canale, per "
+"esempio <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -1019,7 +1071,7 @@ msgstr "Modifica canale"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr "Scansione CD-ROM in corso"
+msgstr "Scansione CD-ROM"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 #, fuzzy
@@ -1036,21 +1088,24 @@ msgstr "_Ricarica"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr "Visualizza e installa gli aggiornamenti disponibili"
+msgstr "Mostra e installa gli aggiornamenti disponibili"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Gestore degli aggiornamenti"
+msgstr "Gestore aggiornamenti"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Controllare automaticamente se è disponibile una nuova versione della "
+"distribuzione corrente e offrire la possibilità di aggiornarlo (se "
+"possibile)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Controlla nuovi rilasci della distribuzione"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1059,7 +1114,7 @@ msgid ""
 "case."
 msgstr ""
 "Se il controllo automatico degli aggiornamenti è disabilitato, è necessario "
-"ricaricare manualmente la lista dei canali. Questa opzione consente di "
+"ricaricare manualmente l'elenco dei canali. Questa opzione consente di "
 "nascondere il promemoria mostrato in questo caso."
 
 #: ../data/update-manager.schemas.in.h:4
@@ -1079,7 +1134,7 @@ msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
-"Salva lo stato dell'espansione che contiene la lista dei cambiamenti e la "
+"Salva lo stato dell'espansore che contiene l'elenco dei cambiamenti e la "
 "descrizione"
 
 #: ../data/update-manager.schemas.in.h:8
@@ -1087,13 +1142,12 @@ msgid "The window size"
 msgstr "Dimensione della finestra"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Controlla i canali software per la presenza di aggiornamenti"
+msgstr "Controllare i canali software gli aggiornamenti da internet"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
-msgstr "Proprietà Software"
+msgstr "Proprietà software"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
@@ -1159,7 +1213,7 @@ msgstr "Mantenuto dalla comunità (Universe)"
 #. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr "Software non libero (Multiverse)"
+msgstr "Non libero (Multiverse)"
 
 #. ChangelogURI
 #: ../channels/Debian.info.in.h:4
@@ -1180,7 +1234,7 @@ msgstr "http://security.debian.org/"
 #. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Aggiornamenti di sicurezza oer Debian 3.1 \"Sarge\""
+msgstr "Aggiornamenti di sicurezza per Debian 3.1 \"Sarge\""
 
 #. Description
 #: ../channels/Debian.info.in:34
@@ -1200,13 +1254,94 @@ msgstr "Debian \"Sid\" (Unstable)"
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "Software compatibile con le DFSG e con dipendenze non libere"
+msgstr "Software compatibile con le DFSG con dipendenze non libere"
 
 #. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
+#~ msgid "No valid entry found"
+#~ msgstr "Nessuna voce valida trovata"
+
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Durante la scansione delle informazioni sui repository, non è stata "
+#~ "trovata alcuna voce valida per l'aggiornamento.\n"
+
+#~ msgid ""
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery is now run (dpkg --configure -a)."
+#~ msgstr ""
+#~ "Interruzione immediata dell'aggiornamento. Il sistema potrebbe essere in "
+#~ "uno stato inutilizzabile. Verrà avviata una procedura di ripristino (dpkg "
+#~ "--configure -a)."
+
+#~ msgid ""
+#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
+#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
+#~ msgstr ""
+#~ "Notificare questo evento come bug e includere nella notifica i file \"~/"
+#~ "dist-upgrade.log\" e \"~/dist-upgrade-apt.log\". L'aggiornamento viene "
+#~ "interrotto ora. "
+
+#~ msgid "You can install one update"
+#~ msgid_plural "You can install %s updates"
+#~ msgstr[0] "È possibile installare un aggiornamento"
+#~ msgstr[1] "È possibile installare %s aggiornamenti"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Repository cambiati"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "È necessario ricaricare l'elenco dei pacchetti dai server affinché i "
+#~ "cambiamenti apportati abbiano effetto. Ricaricarlo ora?"
+
+#~ msgid ""
+#~ "<big><b>Analysing your system</b></big>\n"
+#~ "\n"
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ msgstr ""
+#~ "<big><b>Analisi del sistema in uso</b></big>\n"
+#~ "\n"
+#~ "Gli aggiornamenti del software possono correggere errori, eliminare "
+#~ "vulnerabilità di sicurezza e fornire nuove funzionalità."
+
+#~ msgid ""
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ msgstr ""
+#~ "Gli aggiornamenti software possono correggere errori, eliminare "
+#~ "vulnerabilità di sicurezza e fornire nuove funzionalità."
+
+#~ msgid ""
+#~ "Only security updates from the official Ubuntu servers will be installed "
+#~ "automatically. The software package \"unattended-upgrades\" needs to be "
+#~ "installed therefor"
+#~ msgstr ""
+#~ "L'installazione automatica è limitata ai soli aggiornamenti di sicurezza "
+#~ "provenienti dai server Ubuntu ufficiali. Il pacchetto software "
+#~ "\"unattended-upgrades\" deve perciò essere installato"
+
+#~ msgid ""
+#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
+#~ "b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and sections of a channel, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+#~ msgstr ""
+#~ "<big><b>Inserire la riga APT completa del canale che si vuole aggiungere</"
+#~ "b></big>\n"
+#~ "\n"
+#~ "La riga APT contiene il tipo, la posizione e le sezioni di un canale, ad "
+#~ "esempio <i>\"deb http://ftp.debian.org sarge main\"</i>"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Sezioni</b>"
 
diff --git a/po/ja.po b/po/ja.po
index 431ea4e8..443183e6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.4\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-11 13:39+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:50+0000\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "詳細"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "%s 日ごと"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "%s 日ごと"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -149,23 +179,42 @@ msgstr ""
 msgid "Reading cache"
 msgstr "キャッシュを読み込み"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+#, fuzzy
+msgid "No valid mirror found"
 msgstr "正しいエントリが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"アップグレードするためにリポジトリ情報を調べている際、正しくないエントリがみ"
-"つかりました。\n"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "リポジトリ情報が無効です"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -173,11 +222,22 @@ msgstr ""
 "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報"
 "告してください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "アップデート中にエラー発生"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -185,11 +245,11 @@ msgstr ""
 "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。"
 "ネットワーク接続をチェックし、再びアップデートしてください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "ディスクの空き領域が足りません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -200,15 +260,15 @@ msgstr ""
 "ミ箱を空にして、'sudo apt-get clean' コマンドを実行し、以前インストールした一"
 "時パッケージを削除してください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "アップグレードを開始しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "アップグレードをインストールできません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
@@ -217,11 +277,11 @@ msgstr ""
 "アップグレードを中断しました。システムが使用できない状態になっている可能性が"
 "あります。ただいま修正を実行中です (dpkg --configure -a)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "アップグレードをダウンロードできません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -229,23 +289,23 @@ msgstr ""
 "アップグレードを中断しました。インターネット接続またはインストールメディア"
 "(CD-ROMなど)をチェックし。再試行してください。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "不要なパッケージを削除しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "このステップをスキップ(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "コミット中にエラー"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -255,20 +315,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "パッケージマネージャをチェック中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "リポジトリ情報をアップデート"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -276,44 +336,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "確認する"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "アップグレード中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "古いソフトウェアを検索する"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "システムのアップグレードが完了しました。"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "ドライブ '%s' に'%s' を挿入してください"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "ダウンロードが完了しました"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "残り %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "%i のうち %i をダウンロード中"
@@ -321,21 +381,21 @@ msgstr "%i のうち %i をダウンロード中"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "変更を適用中"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "'%s' がインストールできません"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "アップグレードが中断しました。不具合を報告してください。"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -344,15 +404,15 @@ msgstr ""
 "設定ファイル %s\n"
 "を置き換えますか？"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "'diff' コマンドが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "重大なエラーが発生しました"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -360,75 +420,74 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "~/dist-upgrade.log と ~/dist-upgrade-apt.log を含めて不具合として報告してくだ"
-"さい。アップグレードは中断しました。 "
+"さい。アップグレードは中断しました。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s つのパッケージが削除されます。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s·つのパッケージがインストールされます。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s·つのパッケージがアップグレードされます。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "全部で %s つのパッケージをダウンロードする必要があります。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr "アップグレードには数時間かかり、今後一切キャンセルはできません。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
-"データロスを避けるため、すべてのアプリケーションとドキュメントを閉じてくださ"
-"い。"
+"データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ"
+"さい。"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "アップグレードが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "システムはすでに最新の状態です。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>削除されるパッケージ: %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "インストール %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "アップグレード %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
-msgstr "リブートしてください"
+msgstr "再起動してください"
 
 #: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
-msgstr ""
-"アップグレードが終了しました。リブートが必要ですが、すぐに実行しますか？"
+msgstr "アップグレードが終了しました。再起動が必要ですが、すぐに実行しますか？"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -448,7 +507,7 @@ msgid ""
 msgstr ""
 "<b><big>アップグレードをキャンセルしますか？</big></b>\n"
 "\n"
-"アップグレードをキャンセルすると、システムはおそらく不安定な状態になります。"
+"アップグレードをキャンセルすると、おそらくシステムは不安定な状態になります。"
 "アップグレードを再開することを強くおすすめします。"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
@@ -474,7 +533,7 @@ msgstr "クリーンアップ"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr "詳細"
+msgstr "詳細情報"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
@@ -525,91 +584,90 @@ msgid "_Resume Upgrade"
 msgstr "アップグレードを再開する(_R)"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "アップグレードが見つかりません"
+msgstr "リリースノートが見つかりません"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "サーバに過負荷がかかっています。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "アップグレードをダウンロードできません"
+msgstr "リリースノートををダウンロードできません"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "インターネット接続を確認してください。"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "アップグレードをインストールできません"
+msgstr "アップグレードツールを実行できません"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 "
+msgstr "これはおそらくアップグレードツールのバグです。報告してください。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "アップグレードをダウンロードし、インストール"
+msgstr "アップグレードツールをダウンロード"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "アップグレードツールはアップグレードの状況をガイドします。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "アップグレードツールの署名"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "アップグレード %s"
+msgstr "アップグレード ツール"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "取得に失敗しました"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "アップグレードの取得に失敗しました。おそらくネットワークの問題です。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "抽出に失敗しました"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"アップグレードの抽出に失敗しました。おそらくネットワークまたはサーバの問題で"
+"す。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "検証に失敗しました"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"アップグレードの検証に失敗しました。おそらくネットワークまたはサーバの問題で"
+"す。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "認証"
+msgstr "認証に失敗しました"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"アップグレードの認証に失敗しました。おそらくネットワークまたはサーバの問題で"
+"す。 "
 
 #: ../UpdateManager/GtkProgress.py:107
 #, fuzzy, python-format
@@ -623,21 +681,21 @@ msgstr "ダウンロード中: 速度不明で %li のうち %li"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "変更点がまだ取得できません。あとで試してください。"
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
 "い。"
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "インストールできるアップデートを表示し、インストール"
+msgstr "すべてのアップデートをインストールすることができません"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -645,108 +703,103 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"ほかのソフトを削除しなければならないアップデートがあります。完全にアップグ"
+"レードするためにはパッケージマネージャ \"Synaptic\" の \"すべてのアップグレー"
+"ドににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を実行して"
+"ください。"
 
 #: ../UpdateManager/UpdateManager.py:195
 #, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "これらのパッケージはアップグレードされません: "
+msgstr "これらのパッケージはアップグレードされません:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "バージョン %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "変更点を取得中..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "ダウンロードサイズ: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "システムは最新の状態です!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "インストールできるアップデートを表示し、インストール"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "詳細を表示"
+msgstr "詳細を隠す"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "詳細を表示"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "しばらくお待ちください。少々時間がかかります。"
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "ダウンロードが完了しました"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "リポジトリが変更されました"
+msgstr "アップデートが完了しました"
 
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコピー"
-"しました\n"
-"\n"
-"パッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "新しいバージョン: %s"
+msgstr "新しいバージョン: %s (サイズ: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr "あなたのディストリビューションはすでにサポート対象外です。"
+msgstr "このディストリビューションはすでにサポート対象外です"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"セキュリティフィックスやアップデートはもう提供されません。最新バージョンの "
+"Ubuntu Linux にアップグレードしてください。\r\n"
+"アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"ソフトウェアマネージメントツールは同時に1つしか実行することができません"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"まず 'aptitude' または 'Synaptic' など、ほかのアプリケーションを終了してくだ"
+"さい。"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "ソフトウェアのインデックスが壊れています"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"何らかのソフトウェアがインストールないし削除できません。 \"Synaptic\" パッ"
+"ケージマネージャを使用するか、 まずこの問題を解決するために \"sudo apt-get "
+"install -f\" コマンドをターミナルで実行してください。"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -762,11 +815,12 @@ msgstr ""
 "Properties)\" で行います。"
 
 #: ../data/UpdateManager.glade.h:4
+#, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>システムを解析中です</b></big>\n"
 "\n"
@@ -795,7 +849,7 @@ msgstr "新しいアップデートのためにソフトウェアチャンネル
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
-msgstr "詳細"
+msgstr "説明"
 
 #: ../data/UpdateManager.glade.h:13
 msgid "Release Notes"
@@ -803,16 +857,17 @@ msgstr "リリースノート"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr "シングル・ファイルの進捗を表示"
+msgstr "ファイルの進捗を表示"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
 msgstr "ソフトウェアのアップデート"
 
 #: ../data/UpdateManager.glade.h:17
+#, fuzzy
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "アップデートによってソフトウェアの問題を修正し、セキュリティホールを除去し、"
 "新機能を追加します。"
@@ -851,7 +906,7 @@ msgstr "<b>鍵</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr "CDの追加(_C)"
+msgstr "CD-ROM の追加(_C)"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -874,10 +929,10 @@ msgid "Internet Updates"
 msgstr "インターネットアップデート"
 
 #: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "公式な Ubuntu サーバからのセキュリティアップデートだけ自動的にインストールさ"
 "れます。なので \"非公式サーバにある\" ソフトウェアパッケージをインストールす"
@@ -922,8 +977,8 @@ msgid ""
 msgstr ""
 "<b><big>チャンネルの情報が古いです</big></b>\n"
 "\n"
-"新規追加ないし変更したチャンネルからインストールないしアップデートするため"
-"に、チャンネルをリロードしてください。\n"
+"新規追加ないし変更したチャンネルからインストールまたはアップデートを行うた"
+"め、チャンネルを再読み込みしてください。\n"
 "\n"
 "続けるためには、インターネット接続が有効になっている必要があります。"
 
@@ -949,18 +1004,19 @@ msgstr "<b>ディストリビューション:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
-msgstr "<b>タイプ:</b>"
+msgstr "<b>種類:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
+#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>追加したい完全な APT line を入力してください。</b></big>\n"
@@ -990,7 +1046,7 @@ msgstr "チャンネルを編集"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr "CD-ROMをスキャン"
+msgstr "CD-ROM を検査中"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
 msgid "_Add Channel"
@@ -1017,10 +1073,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"現在使用中のディストリビューションの最新バージョンが存在する場合自動的に"
+"チェックし、可能ならアップグレードを提案する"
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "新しいディストリビューションのリリースをチェックする"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1029,8 +1087,7 @@ msgid ""
 "case."
 msgstr ""
 "アップデートの自動チェックを無効にすると、チャンネルリストを手動で再読み込み"
-"するしなければなりません。このオプションはこの場合の催促を隠すことを許可しま"
-"す。"
+"しなければなりません。このオプションはその場合の催促をしないようにします。"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1055,9 +1112,8 @@ msgid "The window size"
 msgstr "ウィンドウのサイズ"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "新しいアップデートのためにソフトウェアチャンネルをチェック"
+msgstr "ソフトウェアチャンネルとインターネットアップデートを設定"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1175,6 +1231,23 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSGに適合しないソフトウェア"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "アップグレードするためにリポジトリ情報を調べている際、正しくないエントリが"
+#~ "みつかりました。\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "リポジトリが変更されました"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "変更点を有効にするためにパッケージリストをサーバから再取得する必要がありま"
+#~ "す。今すぐ実行しますか?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>セクション:</b>"
 
diff --git a/po/ka.po b/po/ka.po
new file mode 100644
index 00000000..2113e4a4
--- /dev/null
+++ b/po/ka.po
@@ -0,0 +1,1144 @@
+# Georgian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-22 20:16+0000\n"
+"Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n"
+"Language-Team: Georgian <ka@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:111
+#, python-format
+msgid "Every %s days"
+msgstr "ყოველ %s დღეში"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:141
+#, python-format
+msgid "After %s days"
+msgstr "%s დღის შემდეგ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:422
+msgid "Import key"
+msgstr "გასაღების იმპორტი"
+
+#: ../SoftwareProperties/SoftwareProperties.py:432
+msgid "Error importing selected file"
+msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა"
+
+#: ../SoftwareProperties/SoftwareProperties.py:433
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+"ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს "
+"დაზიანებული."
+
+#: ../SoftwareProperties/SoftwareProperties.py:445
+msgid "Error removing the key"
+msgstr "გასღების წაშლა ვერ მოხერხდა"
+
+#: ../SoftwareProperties/SoftwareProperties.py:446
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+"ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი."
+
+#: ../SoftwareProperties/SoftwareProperties.py:487
+#, python-format
+msgid ""
+"<big><b>Error scaning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+"<big><b>ვერ მოხერხდა CD-ს წაკითხვა</b></big>\n"
+"\n"
+"%s"
+
+#: ../SoftwareProperties/SoftwareProperties.py:544
+msgid "Please enter a name for the disc"
+msgstr "შეიყვანეთ დისკის სახელი"
+
+#: ../SoftwareProperties/SoftwareProperties.py:560
+msgid "Please insert a disc in the drive:"
+msgstr "მოათავსეთ დისკი დისკწამყვანში:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+msgid "Broken packages"
+msgstr "გაფუჭებული პაკეტები"
+
+#: ../DistUpgrade/DistUpgradeCache.py:93
+msgid ""
+"Your system contains broken packages that couldn't be fixed with this "
+"software. Please fix them first using synaptic or apt-get before proceeding."
+msgstr ""
+"თქვენს სისტემაში არის დაფუჭებული პაკეტები, რომელთა გამართვა ვერ ხერხდება ამ "
+"პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და "
+"შემდეგ გააგრძელეთ."
+
+#: ../DistUpgrade/DistUpgradeCache.py:135
+msgid "Can't upgrade required meta-packages"
+msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა"
+
+#: ../DistUpgrade/DistUpgradeCache.py:142
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:145
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:146
+msgid ""
+"A unresolvable problem occured while calculating the upgrade. Please report "
+"this as a bug. "
+msgstr ""
+"მოხდა დაუდგენელი შეცდომა განახლების დათვლისას. შეატყობინეთ ეს როგორხ "
+"ხარვეზი. "
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:169
+msgid "Error authenticating some packages"
+msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა"
+
+#: ../DistUpgrade/DistUpgradeCache.py:170
+msgid ""
+"It was not possible to authenticate some packages. This may be a transient "
+"network problem. You may want to try again later. See below for a list of "
+"unauthenticated packages."
+msgstr ""
+"ვერ ხერხვდება ზოგიერთი პაკეტის ავთენთიფიკაცია. ეს შეიძლება იყოს კავშირის "
+"ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-"
+"ავთენთიფიცერული პაკეტების სია."
+
+#: ../DistUpgrade/DistUpgradeCache.py:233
+#, python-format
+msgid "Can't install '%s'"
+msgstr "'%s' ვერ დაყენდა"
+
+#: ../DistUpgrade/DistUpgradeCache.py:234
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:241
+msgid "Can't guess meta-package"
+msgstr "მეტა-პაკეტი ვერ გამოვიცანით"
+
+#: ../DistUpgrade/DistUpgradeCache.py:242
+msgid ""
+"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
+"desktop package and it was not possible to detect which version of ubuntu "
+"you are runing.\n"
+" Please install one of the packages above first using synaptic or apt-get "
+"before proceeding."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:42
+msgid "Reading cache"
+msgstr "მიმდინარეობს ქეშის წაკითხვა"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
+msgid "Repository information invalid"
+msgstr "რეპოზიტორიების ინფორმაცია არასწორეა"
+
+#: ../DistUpgrade/DistUpgradeControler.py:180
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+"რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ "
+"ხარვეზი."
+
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
+msgid "Error during update"
+msgstr "განახლებისას მოხდა შეცდომა"
+
+#: ../DistUpgrade/DistUpgradeControler.py:234
+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:253
+msgid "Not enough free disk space"
+msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი"
+
+#: ../DistUpgrade/DistUpgradeControler.py:254
+#, python-format
+msgid ""
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:260
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:277
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:278
+msgid ""
+"The upgrade aborts now. Your system can be in an unusable state. A recovery "
+"was run (dpkg --configure -a)."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:293
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:294
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:336
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:337
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:337
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:347
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:348
+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:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:380
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:400
+#, python-format
+msgid ""
+"After your package information was updated the essential package '%s' can "
+"not be found anymore.\n"
+"This indicates a serious error, please report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:410
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:414
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:421
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:426
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
+msgid "Download is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
+#, python-format
+msgid "Downloading file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
+#, python-format
+msgid "%s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
+#, python-format
+msgid "Downloading file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
+msgid "The upgrade aborts now. Please report this bug."
+msgstr ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
+#, python-format
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
+msgid ""
+"Please report this as a bug and include the files /var/log/dist-upgrade.log "
+"and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
+"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
+#, python-format
+msgid "%s package is going to be removed."
+msgid_plural "%s packages are going to be removed."
+msgstr[0] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
+#, python-format
+msgid "%s new package is going to be installed."
+msgid_plural "%s new packages are going to be installed."
+msgstr[0] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
+#, python-format
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
+msgid "Could not find any upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+msgid "Your system has already been upgraded."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:75
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:76
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid ""
+"<b><big>Cancel the running upgrade?</big></b>\n"
+"\n"
+"The system could be in an unusable state if you cancel the upgrade. You are "
+"strongly adviced to resume the upgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid ""
+"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
+"span>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Downloading and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "Upgrading Ubuntu"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:151
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:152
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:175
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:182
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:185
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:207
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:213
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:220
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid ""
+"Verfing the upgrade failed.  There may be a problem with the network or with "
+"the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:227
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:107
+#, python-format
+msgid "Downloading file %li of %li with %s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:111
+#, python-format
+msgid "Downloading file %li of %li with unknown speed"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:148
+msgid "The list of changes is not available yet. Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:153
+msgid ""
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr ""
+
+#. print "WARNING, keeping packages"
+#: ../UpdateManager/UpdateManager.py:184
+msgid "Cannot install all available updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:185
+msgid ""
+"Some updates require the removal of further software. Use the function "
+"\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
+"get dist-upgrade\" in a terminal to update your system completely."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:195
+msgid "The following updates will be skipped:"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:330
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:390
+msgid "Downloading the list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:432
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+
+#: ../UpdateManager/UpdateManager.py:458
+msgid "Hide details"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
+msgid "Show details"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:475
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:477
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
+msgid "New version: %s   (Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:594
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:595
+msgid ""
+"You will not get any further security fixes or critical updates. Upgrade to "
+"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
+"information on upgrading."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:646
+msgid "Only one software management tool is allowed to run at the same time"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:648
+msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:665
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid ""
+"It is impossible to install or remove any software. Please use the package "
+"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
+"this issue at first."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:1
+msgid ""
+"<b><big>You must check for updates manually</big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Examining your system</b></big>\n"
+"\n"
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Description"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:16
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:17
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:18
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:19
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
+msgid "_Check"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:21
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:22
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the background, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid "     "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+msgid ""
+"<b><big>The channel information is out-of-date</big></b>\n"
+"\n"
+"You have to reload the channel information to install software and updates "
+"from newly added or changed channels. \n"
+"\n"
+"You need a working internet connection to continue."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Channel</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:11
+msgid "<b>Components</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:12
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line includes the type, location and components of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:22
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:23
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:24
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:25
+msgid "_Custom"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:26
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure software channels and internet updates"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Properties"
+msgstr ""
+
+#. ChangelogURI
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:6
+msgid "Ubuntu 6.06 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:23
+msgid "Ubuntu 6.06 Security Updates"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:40
+msgid "Ubuntu 6.06 Updates"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:57
+msgid "Ubuntu 6.06 Backports"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:108
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:125
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:131
+msgid "Restricted copyright"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:134
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:137
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. ChangelogURI
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index be9b38b8..a4b57dda 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-10 18:55+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:31+0000\n"
 "Last-Translator: Jonas Slivka <jonas.slivka@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,41 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "Detalės"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "Kas %s dienas"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Kas %s dienas"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -152,24 +182,42 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Nuskaitoma talpykla"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+#, fuzzy
+msgid "No valid mirror found"
 msgstr "Nerasta tinkamo įrašo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"Skanuojant Jūsų saugyklos informaciją nebuvo rasta tinkamo atnaujinimo "
-"įrašo.\n"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Saugyklų informacija netinkama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -177,11 +225,22 @@ msgstr ""
 "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. "
 "Praneškite apie tai kaip klaidą."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Klaida atnaujinant"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -189,11 +248,11 @@ msgstr ""
 "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, "
 "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Diske nepakanka laisvos vietos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -204,15 +263,15 @@ msgstr ""
 "šiukšlinę ir pašalinkite laikinus paketus, likusius iš praeitų diegimų "
 "naudodamiesi komanda „sudo apt-get clean“."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "At norite pradėti atnaujinimą?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Nepavyko įdiegti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
@@ -221,11 +280,11 @@ msgstr ""
 "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama naudoti. "
 "Dabar bus vykdomas atkūrimas (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Nepavyko atsiųsti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -233,23 +292,23 @@ msgstr ""
 "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo "
 "laikmeną ir bandykite dar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Pašalinti pasenusius paketus?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Praleisti šį žingsnį"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "P_ašalinti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -259,20 +318,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Tikrinama paketų valdyklė"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Atnaujinama saugyklų informacija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -280,44 +339,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Klausiama patvirtinimo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Atnaujinama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Ieškoma pasenusios programinės įrangos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Sistemos atnaujinimas baigtas."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Įdėkite „%s“ į įrenginį „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Atsiųsta"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "liko %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, fuzzy, python-format
 msgid "Downloading file %li of %li"
 msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
@@ -325,21 +384,21 @@ msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
 #. 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Pritaikomi pakeitimai"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nepavyko įdiegti „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Atnaujinimas nutrūko. Praneškite apie tai kaip apie klaidą."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -348,15 +407,15 @@ msgstr ""
 "Ar pakeisti konfigūracijos bylą\n"
 "„%s“?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Nerasta komanda „diff“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Įvyko lemtinga klaida"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -364,9 +423,9 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Praneškite apie tai kaip klaidą ir prie pranešimo pridėkite „~/dist-upgrade."
-"log“ bei „~/dist-upgrade-apt.log“ bylas. Atnaujinimas dabar bus nutrauktas. "
+"log“ bei „~/dist-upgrade-apt.log“ bylas. Atnaujinimas dabar bus nutrauktas."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -374,7 +433,7 @@ msgstr[0] "Bus pašalintas %s paketas."
 msgstr[1] "Bus pašalinti %s paketai."
 msgstr[2] "Bus pašalinta %s paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -382,7 +441,7 @@ msgstr[0] "Bus įdiegtas %s naujas paketas."
 msgstr[1] "Bus įdiegti %s nauji paketai."
 msgstr[2] "Bus įdiegta %s naujų paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -390,43 +449,43 @@ msgstr[0] "Bus atnaujintas %s paketas."
 msgstr[1] "Bus atnaujinti %s paketai."
 msgstr[2] "Bus atnaujinta %s paketų."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Turite atsisiųsti viso %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir "
 "dokumentus."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Nepavyko rasti jokių atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Jūsų sistema jau buvo atnaujinta."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Pašalinti %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Įdiegti %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Atnaujinti %s"
@@ -545,52 +604,48 @@ msgstr "Nepavyko rasti jokių atnaujinimų"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Serveris gali būti perkrautas. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Nepavyko atsiųsti atnaujinimų"
+msgstr "Nepavyko atsiųsti laidos informacijos"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Patikrinkite savo Interneto ryšį."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Nepavyko įdiegti atnaujinimų"
+msgstr "Nepavyko paleisti atnaujinimo priemonės"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Iškilo neišsprendžiama problema apskaičiuojant atnaujinimą. Praneškite apie "
-"tai kaip klaidą. "
+"Greičiausiai tai yra atnaujinimo priemonės klaida. Praneškite apie tai kaip "
+"klaidą"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Atsiunčiami ir įdiegiami atnaujinimai"
+msgstr "Atsiunčiama atnaujinimo priemonė"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
+#, fuzzy
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Atnaujinimo priemonės parašas"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Atnaujinti %s"
+msgstr "Atnaujinimo priemonė"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Atsiųsti nepavyko"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
@@ -598,34 +653,38 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Nepavyko išpakuoti"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Nepavyko išpakuoti atnaujinimo. Gali būti tinklo arba serverio problema. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Tapatumo nustatymas nepavyko"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Atnaujinimo tapatumo nustatymas nepavyko. Gali būti tinklo arba serverio "
+"problema. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autentikacija"
+msgstr "Autentikacija nepavyko"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Nepavyko patvirtinti atnaujinimo autentiškumo. Gali būti tinklo arba "
+"serverio problema. "
 
 #: ../UpdateManager/GtkProgress.py:107
 #, fuzzy, python-format
@@ -633,24 +692,25 @@ msgid "Downloading file %li of %li with %s/s"
 msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
+msgstr "Atsiunčiama rinkmena %li iš %li, nežinomu greičiu"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
-msgstr ""
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Rodyti ir įdiegti galimus atnaujinimus"
+msgstr "Negalima įdiegti visų galimų atnaujinimų"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -658,118 +718,120 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Kai kuriems atnaujinimams reikia pašalinti programinę įrangą. Naudokitės "
+"funkcija „Žymėti visus atnaujinimus“ paketų tvarkyklėje „Synaptic­“ arba "
+"terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų sistema "
+"būtų visiškai atnaujinta."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "Šie atnaujinimai nebus įdiegti:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "Versija %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu"
+msgstr "Atsiunčiamas pakeitimų sąrašas..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Atsiuntimo dydis: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "Jūsų sistema atnaujinta"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus"
 msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus"
 msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Rodyti detales"
+msgstr "Slėpti detales"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Rodyti detales"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Palaukite, tai gali užtrukti."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Atsiųsta"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
+msgstr "Atnaujinimas užbaigtas"
 
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Nauja versija: %s (Dydis: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "Jūsų distribucija daugiau nebepalaikoma"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Jūs nebegausite jokių saugumo pataisymų ar kritinių atnaujinimų. "
+"Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie "
+"atnaujinimą rasite http://www.ubuntu.com ."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Tik viena programinės įrangos tvarkymo priemonė gali veikti vienu metu"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-msgstr ""
+msgstr "Pirmiausia užverkite kitą programą, pvz., „aptitude“ ar „Synaptic“."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Programinės įrangos turinys sugadintas"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Neįmanoma įdiegti ar pašalinti jokios programinės įrangos. Pirmiausia "
+"pasinaudokite „Synaptic“ arba terminale įvykdykite komandą „sudo apt-get "
+"install -f“, norėdami ištaisyti šią problemą."
 
 #: ../data/UpdateManager.glade.h:1
+#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Jūs turite patikrinti dėl atnaujinimų rankiniu būdu</big></b>\n"
+"\n"
+"Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite pakeisti "
+"naudodamiesi „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“."
 
 #: ../data/UpdateManager.glade.h:4
 #, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Ieškoma galimų atnaujinimų</b></big>\n"
 "\n"
@@ -794,7 +856,7 @@ msgstr "Ti_krinti"
 
 #: ../data/UpdateManager.glade.h:11
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Patikrinti programų kanalus dėl atnaujinimų"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -813,9 +875,10 @@ msgid "Software Updates"
 msgstr "Programinės įrangos atnaujinimai"
 
 #: ../data/UpdateManager.glade.h:17
+#, fuzzy
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo "
 "spragas bei suteikti naujas funkcijas."
@@ -880,8 +943,7 @@ msgstr "Internetiniai atnaujinimai"
 #, fuzzy
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Tik saugumo atnaujinimai iš oficialių „Ubuntu“ serverių bus automatiškai "
 "įdiegti, todėl turi būti įdiegtas „unattended-upgrades“ programų paketas."
@@ -960,11 +1022,12 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
+#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Įveskite visą Jūsų norimo pridėti kanalo APT eilutę</b></big>\n"
@@ -1022,10 +1085,13 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Automatiškai patikrinti, ar yra nauja dabartinės distribucijos versija ir, "
+"jei yra, pasiūlyti atnaujinti."
 
 #: ../data/update-manager.schemas.in.h:2
+#, fuzzy
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Patikrinti, ar yra išleista nauja distribucija"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1033,6 +1099,9 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Jei automatinis atnaujinimų patikrinimas yra išjungtas, iš naujo įkelti "
+"kanalų sąrašą Jūs turėsite rankiniu būdu. Šiuo atveju nebus automatiškai "
+"pranešama apie atnaujinimus."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1109,7 +1178,7 @@ msgstr "Ubuntu 5.10 atnaujinimai"
 #. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
@@ -1177,6 +1246,14 @@ msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis
 msgid "Non-DFSG-compatible Software"
 msgstr "Su DFSG nesuderinama programinė įranga"
 
+#, fuzzy
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Skanuojant Jūsų saugyklos informaciją nebuvo rasta tinkamo atnaujinimo "
+#~ "įrašo.\n"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Skyriai</b>"
 
diff --git a/po/mk.po b/po/mk.po
index 86e504fc..a78481ca 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:23+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:31+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,40 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.10\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Детали</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -142,42 +171,74 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+#, fuzzy
+msgid "Generate default sources?"
+msgstr "Врати ги стандардните клучеви"
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Грешка при отстранување на клучот"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -185,47 +246,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -233,21 +294,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Веќе работи друг менаџер за пакети"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -255,45 +316,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Надградбата е завршена"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -301,17 +362,17 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Преземам промени..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
@@ -319,29 +380,29 @@ msgstr ""
 "како бубачка."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -349,7 +410,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -357,7 +418,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -365,40 +426,40 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -528,7 +589,7 @@ msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
-"како бубачка. "
+"како бубачка."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -603,7 +664,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
 "врска е активна."
@@ -625,93 +687,83 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Верзија %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Преземам промени"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "Преземам промени"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е надграден!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Инсталирам надградби..."
 msgstr[1] "Инсталирам надградби..."
 msgstr[2] "Инсталирам надградби..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Детали</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Вашата дистрибуција повеќе не е поддржана"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -728,10 +780,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -772,8 +824,8 @@ msgstr "Надградба на софтвер"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -840,8 +892,7 @@ msgstr "<b>Надградби од интернет</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -922,7 +973,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Внесете ја комплетната линија за APT складиштето за да го додадете</"
@@ -1245,9 +1296,6 @@ msgstr ""
 #~ msgid "Remove the selected key from the trusted keyring."
 #~ msgstr "Отстрани го избраниот клуч од доверливиот привезок."
 
-#~ msgid "Restore default keys"
-#~ msgstr "Врати ги стандардните клучеви"
-
 #~ msgid ""
 #~ "Restore the default keys shipped with the distribution. This will not "
 #~ "change user installed keys."
diff --git a/po/nb.po b/po/nb.po
index d83454d1..31b9c8a8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-12 07:28+0000\n"
-"Last-Translator: Tor Harald Thorland <linux@strigen.com>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-30 08:28+0000\n"
+"Last-Translator: Anders Martinsen <anders@andersmartinsen.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Daglig"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Annenhver dag"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Ukentlig"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Hver andre uke"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Hver %s dag"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Etter en uke"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Etter to uker"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Etter en måned"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -33,20 +61,20 @@ msgstr "Importer nøkkel"
 
 #: ../SoftwareProperties/SoftwareProperties.py:432
 msgid "Error importing selected file"
-msgstr "Feil under importering av fil"
+msgstr "Feil under importering av valgt fil"
 
 #: ../SoftwareProperties/SoftwareProperties.py:433
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Den valgte filen er ikke en GPG-fil, ellers er den skadet."
+msgstr ""
+"Enten er valgt fil ikke en GPG-nøkkelfil, eller så er den kanskje skadet"
 
 #: ../SoftwareProperties/SoftwareProperties.py:445
 msgid "Error removing the key"
-msgstr "Feil under fjerning av nøkkel"
+msgstr "Kunne ikke fjerne nøkkelen"
 
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
-"Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
+msgstr "Nøkkelen du valgte kan ikke fjernes. Vennligst rapporter denne feilen."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -55,30 +83,30 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"<big><b>Feil under lesing av CD</b></big>\n"
+"<big><b>Kunne ikke søke gjennom CD</b></big>\n"
 "\n"
 "%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:544
 msgid "Please enter a name for the disc"
-msgstr "Vennligst skriv inn et navn for platen"
+msgstr "Vennligst oppgi et navn for platen"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr "Vennligst sett inn planen i stasjonen:"
+msgstr "Vennligst sett inn en plate i CD-spilleren:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr "Ødelagte pakker"
+msgstr "Skadede pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
-"Ditt system inneholder ødelagte pakker som ikke kunne fikses i dette "
-"programmet. Vennligst fiks dem først ved å bruke synaptic eller apt-get før "
-"du fortsetter."
+"Datamaskinen din inneholder skadede pakker som ikke kan repareres ved bruk "
+"av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller "
+"apt-get før du fortsetter."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
@@ -86,7 +114,7 @@ msgstr "Kan ikke oppgradere nødvendige meta-pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr "En nødvendig pakke må bli fjernet"
+msgstr "En nødvendig pakke ville måtte bli fjernet"
 
 #. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
@@ -98,13 +126,13 @@ msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Et uopprettelig problem oppstå ved forberedelse av oppgraderingen. Vennligst "
+"Et uløselig problem oppstod ved forberedelse av oppgraderingen. Vennligst "
 "rapporter dette som en feil. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
-msgstr "Feil ved autentisering av noen pakker"
+msgstr "Kunne ikke autentisere noen pakker"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
 msgid ""
@@ -112,22 +140,21 @@ msgid ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
-"Noen pakker kunne ikke autentiseres. Dette kan være et midlertidig "
-"nettverksproblem, og du bør prøve igjen senere. Se under for en liste over "
-"ikke-autentiserte pakker."
+"Noen av pakkene kunne ikke autentiseres. Dette kan være et midlertidig "
+"nettverksproblem, og kan prøve igjen senere. Se under for listen over pakker "
+"som ikke kunne autentiseres."
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Kan ikke installere '%s'"
+msgstr "Kan ikke installere \"%s\""
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Det var ikke mulig å installere en nødvendig pakke. Vennligst rapporter "
-"denne feilen. "
+"Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
@@ -145,42 +172,77 @@ msgstr ""
 "Ditt system inneholder ikke en ubuntu-desktop, kubuntu-desktop eller "
 "edubuntu-desktop pakke, og det var ikke mulig å finne ut hvilken ubuntu-"
 "versjon du bruker.\n"
-"Vennligst installer én av de overstående pakkene først ved å bruke synaptic "
-"eller ap-get før du fortsetter."
+"Vennligst installer én av de nevnte pakkene først ved å bruke synaptic eller "
+"apt-get før du fortsetter."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
 msgstr "Leser mellomlager"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Fant ikke noen gyldig oppføring"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+#, fuzzy
+msgid "No valid mirror found"
+msgstr "Fant ikke et gyldig speil"
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+#, fuzzy
+msgid "Generate default sources?"
+msgstr "Vil du generere standard kilder?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Fant ikke noen gyldig oppføring for oppgradering ved lesing av "
-"arkivinformasjon.\n"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Ugyldig informasjon om arkiv"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
-"Oppgradering av arkivinformasjon resulterte i en ugyldig fil. Vennligst "
+"Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst "
 "rapporter dette som en feil."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Tredjepartskilder er deaktivert"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+#, fuzzy
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Enkelte tredjeparts linjer i sources.list filen din ble deaktivert. Du kan "
+"aktivere dem etter oppgraderingen ved hjelp av 'software-properties' "
+"verktøyet eller med Synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Feil under oppdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -189,11 +251,11 @@ msgstr ""
 "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din "
 "og prøv igjen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Ikke nok ledig diskplass"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -204,28 +266,28 @@ msgstr ""
 "papirkurven og fjern midlertidige pakker fra tidligere installasjoner ved å "
 "bruke 'sudo apt-get-clean'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Ønsker du å starte oppgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Kunne ikke installere oppgraderingene"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon "
-"kan være å kjøre (dpkg --configure -a)."
+"ble kjørt (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Kunne ikke laste ned alle oppgraderingene."
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -233,23 +295,23 @@ msgstr ""
 "Oppgraderingen avbrytes nå. Vennligst sjekk internet tilkoblingen eller "
 "installasjonsmediet og prøv på nytt. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Ønsker du å fjerne utdaterte pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Hopp over dette punktet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Feil ved commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -259,20 +321,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Sjekker pakkehåndterer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Oppdaterer informasjon om arkivet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Ugyldig pakkeinformasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -280,44 +343,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Spør om bekreftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Oppgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Søker etter utdatert programvare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Systemoppgraderingen er fullført"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Vennligst sett inn '%s' i stasjonen '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Nedlastingen er fullført"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Laster ned fil %li av %li med %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s gjenstår"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Laster ned fil %li av %li"
@@ -325,21 +388,21 @@ msgstr "Laster ned fil %li av %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Lagrer endringer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Kunne ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Oppgraderingen avbrytes nå. Vennligst rapporter dette som en feil."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -348,15 +411,15 @@ msgstr ""
 "Vil du erstatte konfigurasjonsfilen\n"
 "'%s?'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Kommandoen 'diff' ble ikke funnet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "En uopprettelig feil oppsto"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -364,66 +427,66 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Vennligst rapporter feilen og inkluder filene ~/dist-upgrade.log og ~/dist-"
-"upgrade-apt.log i din melding. Oppgraderingen avbrytes nå. "
+"upgrade-apt.log i din melding. Oppgraderingen avbrytes nå."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pakke vil bli fjernet."
 msgstr[1] "%s pakker vil bli fjernet"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s pakke vil bli installert."
 msgstr[1] "%s pakker vil bli installert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pakke vil bli oppgradert."
 msgstr[1] "%s pakker vil bli oppgradert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Du må laste ned totalt %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere "
 "tidspunkt."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Kunne ikke finne noen oppgraderinger"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Systemet ditt er allerede oppgradert."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Fjern %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Installèr %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Oppgradèr %s"
@@ -534,119 +597,119 @@ msgid "_Resume Upgrade"
 msgstr "_Gjenoppta oppgradering"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Kunne ikke finne noen oppgraderinger"
+msgstr "Kunne ikke finne utgivelsesnotatene"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Tjeneren kan være overbelastet. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Kunne ikke laste ned alle oppgraderingene."
+msgstr "Kunne ikke laste ned utgivelsesnotatene"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Vennligst kontrollèr internettforbindelsen."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Kunne ikke installere oppgraderingene"
+msgstr "Kunne ikke kjøre oppgraderingsverktøyet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Et uopprettelig problem oppstå ved forberedelse av oppgraderingen. Vennligst "
-"rapporter dette som en feil. "
+"Dette er mest sannsynlig en feil i oppgraderingsprogrammet. Vennligst "
+"rapporter denne feilen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Laster ned og installerer oppgraderingene"
+msgstr "Laster ned oppgraderingsverktøyet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Dette programmet vil lede deg gjennom oppgraderingsprosessen."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Signatur for oppgraderingsprogrammet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Oppgradèr %s"
+msgstr "Oppgraderingsprogram"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Kunne ikke hente"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Henting av oppgraderingen mislykkes. En mulig årsak er nettverksproblemer. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Utpakking feilet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Feil ved utpakking av oppgraderinge. Det kan være et problem med nettverket "
+"eller tjeneren. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Verifisering feilet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Verifisering av oppgraderingen feilet. Det kan være en feil med nettverket "
+"eller med tjeneren. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autentisering"
+msgstr "Autentiseringen mislyktes"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Autentiseringen av oppgraderingen feilet. Det kan være en feil med "
+"nettverket eller med tjeneren. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "Laster ned fil %li av %li med %s/s"
+msgstr "Laster ned filen %li av %li med %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Laster ned fil %li av %li med ukjent hastighet"
+msgstr "Laster ned fil %li av %li ved ukjent hastighet"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
-msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr "Feil under lasting av endringsliste. Kontroller internettilkoblingen."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Vis og installèr tilgjengelige oppdateringer"
+msgstr "Kan ikke installere alle tilgjengelige oppdateringer."
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -654,110 +717,100 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Noen oppdateringer krever fjerning av andre programpakker. Bruk funksjonen "
+"\"Merk alle oppgraderinger\" i pakkehånteringsprogrammet \"Synaptic\" eller "
+"kjør kommandoen \"sudo apt-get dist-upgrade\" i en terminal for å oppgradere "
+"systemet fullstendig."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "De følgende pakkene er ikke oppgradert: "
+msgstr "Følgende pakker vil ikke bli oppgradert:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versjon %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Laster ned endringer"
+msgstr "Laster ned endringslisten..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Laster ned endringer"
+msgstr "Nedlastings størrelse: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Systemet er helt oppdatert!"
+msgstr "Systemet ditt er oppdatert!"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Vis og installèr tilgjengelige oppdateringer"
-msgstr[1] "Vis og installèr tilgjengelige oppdateringer"
+msgstr[0] "Du kan installere %s oppdatering"
+msgstr[1] "Du kan installere %s oppdateringer"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Vis detaljer"
+msgstr "Skjul detaljer"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Vis detaljer"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Vennligst vent, dette kan ta litt tid."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Nedlastingen er fullført"
+msgstr "Oppdateringen er fullført"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Arkiv har blitt endret"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Arkivinformasjonen har blitt endret. En sikkerhetskopi av «sources.list»-"
-"filen er lagret i %s.save.\n"
-"\n"
-"Du må oppdatere pakkelisten fra tjenerene for at endringene skal tre i "
-"kraft. Vil du gjøre det nå?"
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Ny versjon: %s (Størrelse: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribusjon er ikke lenger støttet"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Du vil ikke lenger motta flere sikkerhetsmessige eller kritiske "
+"oppdateringer. Oppgrader til en nyere utgivelse av Ubuntu. Se http://www."
+"ubuntu.com for mer informasjon om oppgradering."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Du kan ikke bruke flere pakkebehandlingsprogram samtidig"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Vennligst lukk andre programmer som f.eks \"aptitude\" eller \"Synaptic\" "
+"først."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Programvareoversikten er feilaktig."
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Du kan dessverre ikke installere eller fjerne programmer nå. Vennligst bruk "
+"pakkehåndteringsprogrammet \"Synaptic\" eller kjør kommandoen \"sudo apt-get "
+"install -f\" i en terminal for å løse denne situasjonen."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -773,11 +826,12 @@ msgstr ""
 "\"Programvareegenskaper\""
 
 #: ../data/UpdateManager.glade.h:4
+#, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Analyserer ditt system</b></big>\n"
 "\n"
@@ -814,7 +868,7 @@ msgstr "Utgivelsesinformasjon"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr "Vis framgang for enkeltfiler"
+msgstr "Vis fremdrift for enkeltfiler"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
@@ -822,10 +876,10 @@ msgstr "Programvareoppdateringer"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"Programvareoppdateringer kan fikse feil, fjerne sikkerhetshull og tilby ny "
+"Programvareoppdateringer fikser feil, fjerner sikkerhetshull og tilbyr ny "
 "funksjonalitet."
 
 #: ../data/UpdateManager.glade.h:18
@@ -887,12 +941,10 @@ msgstr "Oppdateringer fra Internett"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Kun sikkerhetsoppdateringer fra de offisielle Ubuntu-tjenerne vil bli "
-"installert automatisk. Programvarepakken \"unattended-upgrades\" må derfor "
-"installeres."
+"installert automatisk."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -951,7 +1003,6 @@ msgid "<b>Components:</b>"
 msgstr "<b>Komponenter</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
 msgstr "<b>Komponenter</b>"
 
@@ -972,14 +1023,13 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Skriv inn hele APT-linjen for kanalen du vil legge til</b> </big>\n"
 "\n"
 "APT-linjen inneholder typen, adressen og innholdet til en kanal, for "
-"eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
-"detaljert beskrivelse av syntaksen i dokumentasjonen."
+"eksempel <i>«deb http://ftp.debian.org sarge main»</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -1031,10 +1081,11 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Se etter nyere utgivelser av distribusjonen og tilby om mulig oppgradering."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Se etter nye utgivelser av distribusjonen"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1059,22 +1110,20 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "Lagrer størrelsen for update-manager dialogen"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
 msgstr ""
-"Lagrer innstillingene til delen som inneholder listen over endringer og "
-"beskrivelser"
+"Lagrer ditt valg for hvorvidt endringslogger eller beskrivelse av programmer "
+"skal vises"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "Vindusstørrelsen"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Sjekk programvare kanaler for nye oppdateringer"
+msgstr "Sett opp programvarekanaler og oppdateringer"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1192,6 +1241,23 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Fant ikke noen gyldig oppføring for oppgradering ved lesing av "
+#~ "arkivinformasjon.\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Arkiv har blitt endret"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Du må oppdatere pakkelisten for at endringene skal tre i kraft. Vil du "
+#~ "gjøre dette nå?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Seksjoner</b>"
 
diff --git a/po/ne.po b/po/ne.po
index 50a9b93b..fbefc2d8 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:24+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:31+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,40 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2;plural=(n!=0)\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>विवरणहरु</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -136,42 +165,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "कुञ्जि हटाउँदा त्रुटि"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -179,47 +239,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -227,21 +287,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -249,45 +309,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "स्तरवृद्धि समाप्त"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -295,100 +355,100 @@ msgstr ""
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -516,7 +576,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस "
+msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -591,7 +651,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
 
 #. print "WARNING, keeping packages"
@@ -609,100 +670,84 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:195
 #, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन "
+msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "संस्करण %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "तपाइं को प्रणालि अप-टु-डेट छ!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै"
 msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>विवरणहरु</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "कोषहरु परिवर्तित"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप प्रति "
-"भण्डारण गरिएको छ. बचत गर्नुहोस. \n"
-"\n"
-"तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची  फेरि लोड "
-"गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?"
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "तपाईंको वितरण समर्थित छैन"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -719,10 +764,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -763,8 +808,8 @@ msgstr "सफ्टवेयर अद्यावधिकहरु"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -835,8 +880,7 @@ msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -917,7 +961,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n"
@@ -1141,6 +1185,20 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Repositories changed"
+#~ msgstr "कोषहरु परिवर्तित"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप प्रति "
+#~ "भण्डारण गरिएको छ. बचत गर्नुहोस. \n"
+#~ "\n"
+#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची  फेरि लोड "
+#~ "गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?"
+
 #, fuzzy
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>सेक्सनहरु:</b>"
diff --git a/po/nl.po b/po/nl.po
index 9cbdb996..a7bbced3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
 "PO-Revision-Date: 2006-03-18 12:07+0000\n"
 "Last-Translator: Michiel Sikkes <michiel@eyesopened.nl>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -16,11 +16,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -132,41 +160,72 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -174,47 +233,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -222,20 +281,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -243,44 +302,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -288,97 +347,97 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -575,7 +634,8 @@ msgstr ""
 
 #: ../UpdateManager/UpdateManager.py:153
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 
 #. print "WARNING, keeping packages"
@@ -594,88 +654,78 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -692,10 +742,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -736,8 +786,8 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -799,8 +849,7 @@ msgstr ""
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -874,7 +923,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
diff --git a/po/no.po b/po/no.po
index 1eeda30a..45abbe00 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
 "PO-Revision-Date: 2005-06-08 23:10+0200\n"
 "Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -17,11 +17,40 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Detaljer</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -138,42 +167,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Feil under fjerning av nøkkel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -181,47 +241,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -229,21 +289,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "En annen pakkehåndterer kjører"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -251,46 +311,46 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Undersøker systemkonfigurasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -298,101 +358,101 @@ msgstr ""
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Laster ned endringer..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Systemet har ødelagte pakker!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Detaljer</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "_Installer"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Oppgradering fullført"
@@ -597,7 +657,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
 
 #. print "WARNING, keeping packages"
@@ -617,98 +678,82 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr "De følgende pakkene er ikke oppgradert:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versjon %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Systemet er helt oppdatert!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installerer oppdateringer..."
 msgstr[1] "Installerer oppdateringer..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Detaljer</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Arkiv har blitt endret"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Arkivinformasjonen har blitt endret. En sikkerhetskopi av «sources.list»-"
-"filen er lagret i %s.save.\n"
-"\n"
-"Du må oppdatere pakkelisten fra tjenerene for at endringene skal tre i "
-"kraft. Vil du gjøre det nå?"
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribusjon er ikke lenger støttet"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -725,10 +770,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -769,8 +814,8 @@ msgstr "Programvareoppdateringer"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -840,8 +885,7 @@ msgstr "<b>Oppdateringer fra Internett</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -922,7 +966,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </big>\n"
@@ -1145,6 +1189,20 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Repositories changed"
+#~ msgstr "Arkiv har blitt endret"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Arkivinformasjonen har blitt endret. En sikkerhetskopi av «sources.list»-"
+#~ "filen er lagret i %s.save.\n"
+#~ "\n"
+#~ "Du må oppdatere pakkelisten fra tjenerene for at endringene skal tre i "
+#~ "kraft. Vil du gjøre det nå?"
+
 #, fuzzy
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Seksjoner:</b>"
diff --git a/po/pa.po b/po/pa.po
index 0a2c6e55..ae717980 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:24+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:31+0000\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,40 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -133,41 +162,72 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -175,47 +235,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,20 +283,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -244,45 +304,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -290,97 +350,97 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -581,7 +641,8 @@ msgstr ""
 
 #: ../UpdateManager/UpdateManager.py:153
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 
 #. print "WARNING, keeping packages"
@@ -600,90 +661,80 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 #, fuzzy
 msgid "Show details"
 msgstr "<b>ਵੇਰਵਾ</b>"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -700,10 +751,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -745,8 +796,8 @@ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -816,8 +867,7 @@ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -898,7 +948,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 16d38395..16b2e510 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-10 09:28+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-29 17:08+0000\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,39 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Codziennie"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Co %s dni"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Co tydzień"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Co dwa tygodnie"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Co %s dni"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Po tygodniu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Po dwóch tygodniach"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Po miesiącu"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -45,7 +73,7 @@ msgstr "Błąd podczas usuwania klucza"
 
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić ten błąd."
+msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -68,7 +96,7 @@ msgstr "Proszę włożyć płytę do napędu:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr "Pakiety są błędne"
+msgstr "Uszkodzone pakiety"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
@@ -98,7 +126,7 @@ msgid ""
 "this as a bug. "
 msgstr ""
 "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. Proszę "
-"zgłosić ten błąd. "
+"zgłosić to jako błąd. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
@@ -118,13 +146,13 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Nie można zainstalować '%s'"
+msgstr "Nie można zainstalować \"%s\""
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
 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ć ten błąd. "
+msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
@@ -147,23 +175,53 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Odczytywanie bufora podręcznego"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Nie odnaleziono poprawnych wpisów"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Nie odnaleziono poprawnego serwera lustrzanego"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"Podczas skanowaia informacji o repozytoriach nie odnaleziono poprawnych "
-"wpisów potrzebnych do aktualizacji.\n"
+"Podczas skanowania informacji o repozytoriach nie wykryto serwera "
+"lustrzanego dla aktualizacji. To może się zdarzyć, jeśli używasz wewnętrzny "
+"serwer lustrzany lub informacje o serwerze są nieaktualne.\n"
+"\n"
+"Czy chcesz przepisać plik \"sources.list\" mimo tego? Jeśli wybierzesz \"Tak"
+"\" wpisy \"%s\" do \"%s\" zostaną zaktualizowane.\n"
+"Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Wygenerować domyślne źródła?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+"Po zeskanowaniu \"sources.list\" nie odnaleziono poprawnego wpisu dla \"%s"
+"\".\n"
+"\n"
+"Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" "
+"aktualizacja zostanie anulowana."
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Błędne informacje o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -171,11 +229,25 @@ msgstr ""
 "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę "
 "zgłosić ten błąd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Źródła stron niezależnych zostały wyłączone"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Niektóre źródła stron niezależnych zostały wyłączone. Można je z powrotem "
+"włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" "
+"lub za pomocą Synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Błąd podczas aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -183,11 +255,11 @@ msgstr ""
 "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z "
 "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Zbyt mało miejsca na dysku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -196,18 +268,17 @@ msgid ""
 msgstr ""
 "Aktualizacja została przerwana. Proszę zwolnić co najmniej %s miejsca na "
 "dysku. Proszę opróżnić kosz i usunąć pliki tymczasowe z poprzednich "
-"instalacji używając 'sudo apt-get clean'."
+"instalacji używając \"sudo apt-get clean\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Czy chcesz rozpocząć aktualizację?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem."
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
@@ -216,11 +287,11 @@ msgstr ""
 "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --"
 "configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Pobranie aktualizacji było niemożliwe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -228,23 +299,23 @@ msgstr ""
 "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz "
 "dysk instalacyjny i spróbować ponownie. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Usunąć niepotrzebne pakiety?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
-msgstr "Pomiń ten krok"
+msgstr "_Pomiń ten krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
-msgstr "Usuń"
+msgstr "_Usuń"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Błąd podczas zatwierdzania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -254,65 +325,69 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Sprawdzanie menedżera pakietów"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Aktualizowanie informacji o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Błędne informacje o pakietach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Po aktualizacji informacji o pakietach, podstawowy pakiet \"%s\" nie mógł "
+"być odnaleziony.\n"
+"To wskazuje na poważny problem, proszę zgłosić ten błąd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Pytanie o potwierdzenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Aktualizacja w toku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Aktualizacja systemu zakończona powodzeniem."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr "Proszę włożyć '%s' do napędu '%s'"
+msgstr "Proszę włożyć \"%s\" do napędu \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Pobieranie zostało zakończone."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s pozostało"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Pobieranie pliku %li z %li"
@@ -320,21 +395,21 @@ msgstr "Pobieranie pliku %li z %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Zatwierdzanie zmian"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Nie można było zainstalować '%s'"
+msgstr "Nie można było zainstalować \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -343,85 +418,86 @@ msgstr ""
 "Zastąpić plik konfiguracyjny\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Komenda \"diff\" nie została odnaleziona"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Wystąpił błąd krytyczny"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log oraz "
-"~/dist-upgrade-apt.log. Aktualizacja została przerwana. "
+"~/dist-upgrade-apt.log. Aktualizacja została przerwana.\n"
+"Pierwotny plik sources.list został zapisany w /etc/apt/sources.list."
+"distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] "Pakietów do usunięcia: %s."
-msgstr[1] "Pakietów do usunięcia: %s."
-msgstr[2] "Pakietów do usunięcia: %s."
+msgstr[0] "%s pakiet zostanie usunięty."
+msgstr[1] "%s pakiety zostaną usunięte."
+msgstr[2] "%s pakietów zostanie usuniętych."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] "Nowych pakietów do zainstalowania: %s."
-msgstr[1] "Nowych pakietów do zainstalowania: %s."
-msgstr[2] "Nowych pakietów do zainstalowania: %s."
+msgstr[0] "%s nowy pakiet zostanie zainstalowany."
+msgstr[1] "%s nowe pakiety zostaną zainstalowane."
+msgstr[2] "%s nowy pakietów zostanie zainstalowane."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] "Pakietów do zaktualizowania: %s."
-msgstr[1] "Pakietów do zaktualizowania: %s."
-msgstr[2] "Pakietów do zaktualizowania: %s."
+msgstr[0] "%s pakiet zostanie zaktualizowany."
+msgstr[1] "%s pakiety zostaną zaktualizowane."
+msgstr[2] "%s pakietów zostanie zaktualizowanych."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Konieczne pobranie ogółem %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i "
 "dokumenty."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr "Nie można było odnaleźć żadnych aktualizacji"
+msgstr "Nie odnaleziono żadnych aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "System został już zaktualizowany."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Usuń %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Instaluj %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Aktualizuj %s"
@@ -513,140 +589,139 @@ msgstr "Aktualizacja Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
-msgstr "Zachowaj"
+msgstr "_Zachowaj"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Replace"
-msgstr "Zastąp"
+msgstr "Zas_tąp"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
-msgstr "Zgłoś błąd"
+msgstr "Zgłoś _błąd"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
-msgstr "Uruchom ponownie"
+msgstr "_Uruchom ponownie"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr "Wznów aktualizację"
+msgstr "_Wznów aktualizację"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Nie można było odnaleźć żadnych aktualizacji"
+msgstr "Nie można było odnaleźć informacji o wydaniu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Serwer może być przeciążony. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Pobranie aktualizacji było niemożliwe"
+msgstr "Pobranie informacji o wydaniu było niemożliwe"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Proszę sprawdzić swoje połączenie internetowe."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem."
+msgstr "Nie można było uruchomić narzędzia aktualizacji"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. Proszę "
-"zgłosić ten błąd. "
+"To najprawdopodobniej błąd w narzędziu aktualizacji. Proszę zgłosić to jako "
+"błąd."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Pobieranie i instalowanie aktualizacji"
+msgstr "Pobieranie narzędzia aktualizacji"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Narzędzie aktualizacji przeprowadzi cię przez proces aktualizacji."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Podpis narzędzia aktualizacji"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Aktualizuj %s"
+msgstr "Narzędzie aktualizacji"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Pobranie nie powiodło się"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Pobranie aktualizacji nie powiodło się. To może być problem sieciowy. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Wyodrębnienie nie powiodło się"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Wyodrębnienie aktualizacji nie powiodło się. To może być problem sieciowy "
+"lub z serwerem. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Weryfikacja nie powiodła się"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy lub "
+"z serwerem. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Uwierzytelnianie"
+msgstr "Uwierzytelnienie nie powiodło się"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Uwierzytelnienie aktualizacji nie powiodło się. To może być problem sieciowy "
+"lub z serwerem. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Nie udało się pobrać informacji o zmianach. Proszę sprawdzić czy połączenie "
-"z internetem jest aktywne"
+"Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z "
+"Internetem."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Pokaż i zainstaluj dostępne aktualizacje"
+msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -654,111 +729,103 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Niektóre aktualizacje wymagają dalszego usuwania oprogramowania. Aby "
+"ukończyć proces aktualizacji użyj opcji \"Zaznacz wszystko do aktualizacji\" "
+"w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade\" w "
+"terminalu."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "Następujące pakiety nie są aktualizowane: "
+msgstr "Następujące pakiety zostaną pominięte:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Wersja %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Pobieranie pliku %li z %li"
+msgstr "Pobieranie informacji o zmianach..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Rozmiar do pobrania: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr "Twój system jest w pełni zaktualizowany"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Pokaż i zainstaluj dostępne aktualizacje"
-msgstr[1] "Pokaż i zainstaluj dostępne aktualizacje"
-msgstr[2] "Pokaż i zainstaluj dostępne aktualizacje"
+msgstr[0] "Ilość dostępnych aktualizacji: %s"
+msgstr[1] "Ilość dostępnych aktualizacji: %s"
+msgstr[2] "Ilość dostępnych aktualizacji: %s"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Wyświetl szczegóły"
+msgstr "Ukryj szczegóły"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Wyświetl szczegóły"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Proszę czekać, to może chwilę potrwać."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Pobieranie zostało zakończone."
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Repozytoria zmienione"
+msgstr "Aktualizacja została ukończona."
 
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Zmieniły się informacje o repozytoriach. Kopia zapasowa oryginalnego pliku "
-"sources.list została zapisana w %s.save. \n"
-"\n"
-"Należy ponownie odczytać listę pakietów z serwerów aby zmiany były widoczne. "
-"Czy chcesz zrobić to teraz?"
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Nowa wersja %s"
+msgstr "Nowa wersja: %s (Rozmiar: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr "Twoja dystrybucja nie jest już wspierana"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Nie będziesz otrzymywać dalszych poprawek błędów bezpieczeństwa ani "
+"krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. "
+"Odwiedź http://www.ubuntu.com po więcej informacji."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"Jednocześnie można uruchomić tylko jedno narzędzie zarządzające "
+"oprogramowaniem"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Proszę najpierw zamknąć to narzędzie, np. \"aptitute\" lub \"Synaptic "
+"Menedżer Pakietów\"."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Spis oprogramowania jest uszkodzony"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Nie ma możliwości instalacji lub usunięcia jakiegokolwiek oprogramowania. "
+"Proszę użyć \"Synaptic Menedżer Pakietów\" lub wydać polecenie \"sudo apt-"
+"get install -f\" w terminalu, aby naprawić ten problem."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -775,10 +842,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Sprawdzanie systemu</b></big>\n"
 "\n"
@@ -791,7 +858,7 @@ msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr "Przerwij pobieranie"
+msgstr "_Przerwij pobieranie"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
@@ -799,7 +866,7 @@ msgstr "Zmiany"
 
 #: ../data/UpdateManager.glade.h:10
 msgid "Chec_k"
-msgstr "Sprawdź"
+msgstr "Sp_rawdź"
 
 #: ../data/UpdateManager.glade.h:11
 msgid "Check the software channels for new updates"
@@ -823,15 +890,15 @@ msgstr "Aktualizacje oprogramowania"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty "
 "bezpieczeństwa i dostarczyć nowe funkcje."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
-msgstr "Aktualizuj"
+msgstr "_Aktualizuj"
 
 #: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
@@ -839,11 +906,11 @@ msgstr "Zaktualizuj do najnowszej wersji Ubuntu"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr "Sprawdź"
+msgstr "Sp_rawdź"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
-msgstr "Ukryj tę informację w przyszłości"
+msgstr "_Ukryj tę informację w przyszłości"
 
 #: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
@@ -871,7 +938,7 @@ msgstr "Uwierzytelnianie"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr "Usuń pobrane pliki oprogramowania:"
+msgstr "_Usuń pobrane pliki oprogramowania:"
 
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
@@ -888,13 +955,14 @@ msgstr "Aktualizacje internetowe"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
+"Aktualizacje zabezpieczeń zostaną zainstalowane automatycznie wyłącznie z "
+"oficjalnych serwerów Ubuntu"
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
-msgstr "Przywróć domyślne klucze"
+msgstr "Przywróć _domyślne klucze"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
@@ -906,11 +974,11 @@ msgstr "Ustawienia oprogramowania"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr "Sprawdzaj dostępność aktualizacji automatycznie:"
+msgstr "_Sprawdzaj dostępność aktualizacji automatycznie:"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
-msgstr "Pobieraj aktualizacje w tle, ale ich nie instaluj"
+msgstr "_Pobieraj aktualizacje w tle, ale ich nie instaluj"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
@@ -946,10 +1014,9 @@ msgstr "<b>Komentarz:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>Components:</b>"
-msgstr "<b>Komponenty</b>"
+msgstr "<b>Komponenty:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
 msgstr "<b>Komponenty</b>"
 
@@ -970,7 +1037,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Wpisz pełny wiersz APT opisujący kanał który chcesz dodać</b></big>\n"
@@ -1013,7 +1080,7 @@ msgstr "Zaawansowane"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 msgid "_Reload"
-msgstr "Wczytaj ponownie"
+msgstr "_Wczytaj ponownie"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
@@ -1028,10 +1095,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Automatycznie sprawdzaj, czy jest dostępna nowa wersja bieżącej dystrybucji "
+"i daj możliwość aktualizacji (jeśli to możliwe)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Sprawdzaj nowe wydania dystrybucji"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1067,7 +1136,6 @@ msgid "The window size"
 msgstr "Rozmiar okna"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
 msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji"
 
@@ -1187,6 +1255,23 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
 msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Podczas skanowania informacji o repozytoriach nie odnaleziono poprawnych "
+#~ "wpisów potrzebnych do aktualizacji.\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Repozytoria zmienione"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Aby zastosować zmiany koniecznie jest ponowne wczytanie listy pakietów z "
+#~ "serwerów. Czy chcesz zrobić to teraz?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Sekcje:</b>"
 
diff --git a/po/pt.po b/po/pt.po
index 1813adda..dbbdaabd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,20 +6,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-08 14:42+0000\n"
-"Last-Translator: Mykas0 <Mykas0@gmail.com>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-29 11:35+0000\n"
+"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Diariamente"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "De 2 em 2 dias"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "De 2 em 2 semanas"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Todos os %s dias"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Após uma semana"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Após duas semanas"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Após um mês"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -151,23 +179,54 @@ msgstr ""
 msgid "Reading cache"
 msgstr "A ler a cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Nenhuma entrada válida encontrada"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Nenhum repositório válido encontrada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+"Enquanto estava a verificar a informação do seu repositório, nenhum "
+"repositório válido para os pacotes foi encontrado. Isto pode acontecer se "
+"estiver a correr um repositório interno ou se a informação do repositório "
+"estiver desactualizada.↵\n"
+"↵\n"
+"Tem a certeza que quer re-escrever o seu ficheiro 'sources.list' na mesma? "
+"Se escolher 'Sim' ele vai actualizar todos os '%s' para '%s' pacotes.↵\n"
+"Se escolher \"não\" a actualização irá ser cancelada."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Gerar as fontes padrão?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Ao pesquisar o seu repositório de informação não foi encontrada nenhuma "
-"entrada válida de actualização.\n"
+"Depois de pesquisar 'sources.list' nenhuma entrada válida para '%s' foi "
+"encontrada.\n"
+"\n"
+"Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a "
+"actualização será cancelada."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Informação de repositório inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -175,11 +234,25 @@ msgstr ""
 "A actualização da informação de repositório resultou num ficheiro inválido. "
 "Por favor reporte este erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Fontes de terceiros desactivadas"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Algumas entradas de terceiros em 'sources.list' foram desactivadas. Pode "
+"reactivá-las depois da actualização com a ferramenta 'propriedades-software' "
+"ou com o synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Erro durante a actualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -188,11 +261,11 @@ msgstr ""
 "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a "
 "tentar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Não existe espaço livre em disco suficiente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -203,29 +276,27 @@ msgstr ""
 "Esvazie o Lixo e remova pacotes temporários de instalações anteriores usando "
 "'sudo apt-get clean'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Deseja iniciar a actualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Impossível de instalar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 "A actualização abortará agora. O seu sistema poderá estar num estado "
-"inutilizável. Por favor tente 'sudo apt-get install -f' ou use o Synaptic "
-"para corrigir o seu sistema."
+"inutilizável. Foi efectuada uma recuperação (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Impossível de descarregar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -233,24 +304,24 @@ msgstr ""
 "A actualização abortará agora. Por favor verifique a sua ligação à internet "
 "ou media de instalação e volte a tentar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Saltar Este Passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 #, fuzzy
 msgid "Error during commit"
 msgstr "Erro ao submeter"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -260,170 +331,177 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "A verificar gestor de pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "A Actualizar informação de repositórios"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Informação de pacotes inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Depois da informação de pacotes ser actualizada já não pode ser encontrado o "
+"pacote essencial '%s'.\n"
+"Isto indica um erro sério, por favor reporte este problema."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "A pedir confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "A actualizar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "À procura de software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "A actualização do sistema está completa."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no leitor '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "O Download está completo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr "A descarregar ficheiro %li de %li com %s/s"
+msgstr "A descarregar ficheiro %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
-msgstr "%s restantes"
+msgstr "Faltam %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
-msgstr ""
+msgstr "A descarregar ficheiro %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Aplicando alterações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "A actualização abortará agora. Reporte este erro."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
+"Substituir ficheiro de configuração\n"
+"'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "O comando 'diff' não foi encontrado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Por favor reporte este erro e inclua os ficheiros ~/dist-upgrade.log e ~/"
-"dist-upgrade-apt.log no seu relatório. A actualização abortará agora. "
+"dist-upgrade-apt.log no seu relatório. A actualização abortará agora. O "
+"ficheiro original sources.list foi guardado em /etc/apt/sources.list."
+"distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pacote será removido."
 msgstr[1] "%s pacotes serão removidos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s novo pacote será instalado."
 msgstr[1] "%s novos pacotes serão instalados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pacote será actualizado."
 msgstr[1] "%s pacotes serão actualizados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Tem de efectuar o download de um total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "A actualização poderá demorar várias horas e não poderá ser cancelada a "
 "qualquer instante posteriormente."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Para prevenir a perda de dados feche todas as aplicações e documentos "
 "abertos."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Impossível de encontrar quaisquer actualizações"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "O seu sistema já foi actualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Remover %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Actualizar %s"
@@ -485,11 +563,11 @@ msgstr "Detalhes"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Diferença entre os ficheiros"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr "A efectuar o download e a instalar actualizações"
+msgstr "A descarregar e a instalar actualizações"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -505,7 +583,7 @@ msgstr "A reiniciar o sistema"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr "Terminal"
+msgstr "Consola"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
@@ -513,12 +591,11 @@ msgstr "A actualizar o Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
-msgstr ""
+msgstr "_Manter"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
 msgid "_Replace"
-msgstr "_Reler"
+msgstr "_Substituir"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
@@ -533,118 +610,121 @@ msgid "_Resume Upgrade"
 msgstr "_Retomar Actualização?"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Impossível de encontrar quaisquer actualizações"
+msgstr "Impossível de encontrar notas de lançamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "O servidor poderá estar sobrecarregado. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Impossível de descarregar as actualizações"
+msgstr "Impossível de descarregar as notas de lançamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Por favor verifique a sua ligação à internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Impossível de instalar as actualizações"
+msgstr "Impossível de executar a ferramenta de actualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Um problema irresolúvel ocorreu ao calcular a actualização. Por favor "
-"reporte este erro. "
+"Isto é provavelmente um erro na ferramenta de actualização. Por favor "
+"reporte o problema."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "A efectuar o download e a instalar actualizações"
+msgstr "A descarregar a ferramenta de actualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "A ferramenta de actualização guiá-lo-á pelo processo de actualização."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Assinatura da ferramenta de actualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Actualizar %s"
+msgstr "Ferramenta de actualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Falha a obter"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Falha a obter a actualização. Poderá existir um problema de rede. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Falha ao extrair"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Extracção da actualização falhou. Poderá existir um problema com a rede ou "
+"com o servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Falhou a verificação"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Verificação da actualização falhou. Poderá existir um problema com a rede ou "
+"com o servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autenticação"
+msgstr "Autenticação falhou"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Autenticação da actualização falhou. Poderá existir um problema com a rede "
+"ou com o servidor. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "A descarregar ficheiro %li de %li com %s/s"
+msgstr "A descarregar ficheiro %li de %li a %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"A lista de alterações ainda não está disponível. Por favor tente mais tarde."
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
+"Falha a descarregar lista de alterações. Por favor verifique a sua ligação à "
+"internet."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Mostrar e instalar actualizações disponíveis"
+msgstr "Impossível de instalar todas as actualizações disponíveis"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -652,127 +732,121 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Algumas actualizações requerem a remoção de software. Utilize a função "
+"\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade\" "
+"numa consola para actualizar completamente o seu sistema."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "As seguintes actualizações serão ignoradas:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "Versão %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "A descarregar ficheiro %li de %li com %s/s"
+msgstr "A descarregar lista de alterações..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Tamanho do download: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "O seu sistema está actualizado!"
+msgstr "O seu sistema está actualizado"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Mostrar e instalar actualizações disponíveis"
-msgstr[1] "Mostrar e instalar actualizações disponíveis"
+msgstr[0] "Pode instalar %s actualização"
+msgstr[1] "Pode instalar %s actualizações"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Mostrar detalhes"
+msgstr "Esconder detalhes"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Mostrar detalhes"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Por favor aguarde, isto pode levar algum tempo."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "O Download está completo"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
+msgstr "A actualização está completa"
 
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Nova versão: %s (Tamanho: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "A sua distribuição já não é suportada"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Não receberá mais actualizações críticas ou de segurança. Actualize para um "
+"versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais "
+"informação em como actualizar."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"Uma única ferramenta de gestão de software pode ser executada ao mesmo tempo"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Por favor feche a outra aplicação primeiro, por ex. 'aptitude' ou 'Synaptic'."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "O índice de software está quebrado"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"É impossível instalar ou remover qualquer software. Por favor utilize o "
+"gestor de pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" numa "
+"consola para corrigir este problema em primeiro lugar."
 
 #: ../data/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
-"<b><big>Tem de reler manualmente a última informação sobre actualizações</"
-"big></b>\n"
+"<b><big>Tem de verificar por actualizações manualmente</big></b>\n"
 "\n"
 "O seu sistema não procura por actualizações automaticamente. Pode configurar "
 "este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do "
 "Software\"."
 
 #: ../data/UpdateManager.glade.h:4
-#, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"<big><b>A procurar por actualizações disponíveis</b></big>\n"
+"<big><b>A examinar o seu sistema</b></big>\n"
 "\n"
 "Actualizações de software podem corrigir erros, eliminar problemas de "
 "segurança, e fornecer novas funcionalidades."
@@ -795,7 +869,7 @@ msgstr "Verific_ar"
 
 #: ../data/UpdateManager.glade.h:11
 msgid "Check the software channels for new updates"
-msgstr "Verificar os canais de software por novas actualizações"
+msgstr "Verificar os repositórios de software por novas actualizações"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -815,8 +889,8 @@ msgstr "Actualizações de Software"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Actualizações de software podem corrigir erros, eliminar problemas de "
 "segurança, e fornecer novas funcionalidades."
@@ -880,12 +954,10 @@ msgstr "Actualizações Internet"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Apenas actualizações de segurança dos servidores oficiais do Ubuntu serão "
-"instaladas automaticamente. O pacote de software \"unattended-upgrades\" "
-"necessita de estar instalado."
+"instaladas automaticamente."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -904,7 +976,6 @@ msgid "_Check for updates automatically:"
 msgstr "_Procurar por actualizações automaticamente:"
 
 #: ../data/SoftwareProperties.glade.h:15
-#, fuzzy
 msgid "_Download updates in the background, but do not install them"
 msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
 
@@ -946,7 +1017,6 @@ msgid "<b>Components:</b>"
 msgstr "<b>Componentes:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
 msgstr "<b>Componentes:</b>"
 
@@ -967,13 +1037,13 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Introduza uma linha completa APT para o repositório que deseja "
 "adicionar</b></big>\n"
 "\n"
-"A linha APT contém o tipo, localização e secções de um repositório, por "
+"A linha APT contém o tipo, localização e componentes de um repositório, por "
 "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
@@ -1026,10 +1096,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Verificar automaticamente se uma nova versão da distribuição actual está "
+"disponível e oferecer para actualizar (se possível)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Verificar por novos lançamentos de distribuições"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1065,9 +1137,8 @@ msgid "The window size"
 msgstr "Tamanho da Janela"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Verificar os canais de software por novas actualizações"
+msgstr "Configurar os repositórios de software e actualizações pela internet"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1096,9 +1167,8 @@ msgstr "Actualizações Ubuntu 6.06"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
 msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 6.04 Backports"
+msgstr "Ubuntu 6.06 Backports"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
@@ -1186,6 +1256,13 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Ao pesquisar o seu repositório de informação não foi encontrada nenhuma "
+#~ "entrada válida de actualização.\n"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Secções</b>"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 62d75745..cc5f2ee8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-10 05:17+0000\n"
-"Last-Translator: Mário Meyer <mariomeyer@ubuntubrasil.org>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-01 01:04+0000\n"
+"Last-Translator: Og Maciel <og.maciel@gmail.com>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,39 @@ msgstr ""
 "X-Poedit-Country: BRAZIL\n"
 "Plural-Forms: nplurals=2; plural=n > 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Diário"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "A cada dois dias"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "A cada duas semanas"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "A cada %s dias"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Após uma semana"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Após duas semanas"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Após um mês"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -154,23 +182,53 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Lendo cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Nenhuma entrada válida encontrada"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Nenhum repositório válido encontrado"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
-"Enquanto analisava as informações de repositórios não foi encontrada uma "
-"entrada válida para a atualização.\n"
+"Enquanto buscava informações em seus repositórios nenhuma entrada para "
+"atualizações foi encontrada. Isso pode acontecer se você está executando um "
+"repositório interno ou se a informação do repositório está desatualizada.\n"
+"\n"
+"Você quer reescrever seu 'sources.list' de qualquer forma? Se você escolher  "
+"'Sim'  atualizará todas '%s' para '%s' entradas.\n"
+"Se você selecionar 'não' a atualização será cancelada."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Gerar sources padrão?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+"Depois de checar seu 'sources.list' nenhuma entrada válida para '%s' foi "
+"encontrada.\n"
+"\n"
+"Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' a "
+"atualização será cancelada."
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Informação de repositório inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -178,11 +236,25 @@ msgstr ""
 "Atualizando a informações de repositórios resultou em um arquivo inválido. "
 "Por favor reporte isso como um erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr "Fontes de terceiros desabilitadas"
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+"Algumas entradas de terceiros de seu sources.list foram desabilitadas. Você "
+"poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do "
+"programa' ou com o synaptic."
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Erro durante a atualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -191,11 +263,11 @@ msgstr ""
 "problemas de rede, por favor verifique a sua conexão de rede e tente "
 "novamente."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Não há espaço suficiente no disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -206,16 +278,15 @@ msgstr ""
 "em disco. Limpe a sua lixeira e remova pacotes temporários de instalações "
 "anteriores executando 'sudo apt-get clean'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Você quer iniciar a atualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Não foi possível instalar as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
@@ -223,11 +294,11 @@ msgstr ""
 "A atualização será abortada agora. Seu sistema pode estar em um estado "
 "instável. Uma recuperação é executada (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Não foi possível obter as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -235,23 +306,23 @@ msgstr ""
 "A atualização será abortada agora. Por favor verifique sua conexão à "
 "Internet ou mídia de instalação e tente de novo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Pular Este Passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Erro ao aplicar as mudanças"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -261,65 +332,69 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Verificando o Gerenciador de Pacotes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Atualizando informação do repositório"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Informação do pacote inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Depois que a informação do seu pacote foi atualizada o pacote essencial '%s' "
+"não pôde mais ser encontrado.\n"
+"Isto indica um sério erro, por favor reporte isso como um erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Pedindi por confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "Atualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Buscando programas obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "A Atualização do Sistema está completa."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no drive '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "O Download está completo"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Obtendo arquivo %li de %li a %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "Faltam %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Obtendo arquivo %li de %li"
@@ -327,21 +402,21 @@ msgstr "Obtendo arquivo %li de %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "A atualização será abortada agora. Por favor reporte este erro."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -350,80 +425,81 @@ msgstr ""
 "Substituir arquivo de configuração\n"
 "'%s' ?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "O comando 'diff' não foi encontrado"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Por favor reporte isto como um bug e inclua os arquivos ~/dist-upgrade.log e "
-"~/dist-upgrade-apt.log em seu relatório. O upgrade abortará agora. "
+"Por favor reporte isto como um bug e inclua os arquivos /var/log/dist-"
+"upgrade.log e /var/log/dist-upgrade-apt.log em seu relatório. O upgrade "
+"abortará agora.\n"
+"Seu sources.list original foi salvo em /etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s pacote será removido."
 msgstr[1] "%s pacotes serão removidos."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s novo pacote será instalado."
 msgstr[1] "%s novos pacotes serão instalados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s pacote será atualizado."
 msgstr[1] "%s pacotes serão atualizados."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Você precisa obter um total de %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "A atualização pode levar diversas horas e não poderá ser cancelada depois."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr "Para evitar perda de dados, feche todas as aplicações e documentos."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Não foi possível encontrar nenhuma atualização"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Seu sistema já foi atualizado."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Remover %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Instalar %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "Atualizar %s"
@@ -533,121 +609,123 @@ msgid "_Resume Upgrade"
 msgstr "Continua_r Atualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Não foi possível encontrar nenhuma atualização"
+msgstr "Não foi possível encontrar as notas de lançamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "O servidor pode estar sobrecarregado. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Não foi possível obter as atualizações"
+msgstr "Não foi possível obter as notas de lançamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Por favor, verifique sua conexão de internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Não foi possível instalar as atualizações"
+msgstr "Não foi possível executar a ferramenta de atualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Um problema sem resolução ocorreu enquanto calculando a atualização. Por "
-"favor reporte isto como um erro. "
+"Este é, provavelmente, um bug na ferramenta de atualização. Por favor, "
+"reporte-o como tal"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Obtendo e instalando as atualizações"
+msgstr "Obtendo a ferramenta de atualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "A ferramenta de atualização irá guia-lo pelo processo."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Assinatura da ferramenta de atualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Atualizar %s"
+msgstr "Ferramenta de atualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Falha ao obter"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Falha ao obter a atualização. Pode ter havido algum problema com a rede. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Falha ao extrair"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Falha ao extrair a atualização. Pode ter havido um problema com a rede ou "
+"com o servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Falha na verificação"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Falha na verificação da atualização. Pode ter havido um problema com a rede "
+"ou com o servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autenticação"
+msgstr "Falha na autenticação"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Falha ao autenticar a atualização. Pode ter havido um problema com a rede ou "
+"com o servidor. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Obtendo arquivo %li de %li a %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
 msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
 msgstr ""
+"A lista de alterações não está disponível ainda. Por favor, tente novamente "
+"mais tarde."
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
-msgstr ""
-"Failed to download changes. Please check if there is an active internet "
+"Failed to download the list of changes. Please check your Internet "
 "connection."
+msgstr ""
+"Não foi possível obter a lista de mudanças. Por favor, verifique sua conexão "
+"com a internet."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Exibir e instalar as atualizações disponíveis"
+msgstr "Não foi possível instalar todas as atualizações disponíveis"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -655,110 +733,100 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Algumas atualizações requerem a remoção de outros pacotes.Use a função "
+"\"Marcar Todas Atualizações\" do gerenciador de pacotes \"Synaptic\" ou rode "
+"\"sudo apt-get dist-upgrade\" em um terminal para atualizar seu sistema "
+"completamente."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "The following packages are not upgraded: "
+msgstr "As seguintes atualizações serão puladas:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Obtendo arquivo %li de %li"
+msgstr "Obtendo a lista de alterações"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Tamanho do download: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Your system is up-to-date!"
+msgstr "Seu sistema está atualizado"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Exibir e instalar as atualizações disponíveis"
-msgstr[1] "Exibir e instalar as atualizações disponíveis"
+msgstr[0] "Você pode instalar %s atualização"
+msgstr[1] "Você pode instalar %s atualizações"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Exibir Detalhes"
+msgstr "Esconder detalhes"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Exibir Detalhes"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Por favor, espere, isto pode levar algum tempo."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "O Download está completo"
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Repositories changed"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"The repository information has changes. A backup copy of your sources.list "
-"is stored in %s.save. \n"
-"\n"
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
+msgstr "Atualização completa"
 
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "New version: %s"
+msgstr "New version: %s (Tamanho: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr "Your distribution is no longer supported"
+msgstr "Sua distribuição não é mais suportada"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Você não terá mais como instalar atualizações críticas ou correções para "
+"falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. "
+"Veja http://www.ubuntu-br.org"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
+"Apenas uma ferramenta de gerenciamento de pacotes pode rodar ao mesmo tempo"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Por favor, feche a outra aplicação e.g. 'aptitude' ou 'Synaptic' primeiro."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "A índex de software está quebrado"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Não é possível instalar ou remover qualquer programa. Por favor use o "
+"Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" "
+"em um terminal para resolver esse problema primeiro."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -775,10 +843,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>Verificando as Atualizações Disponíveis</b></big>\n"
 "\n"
@@ -823,8 +891,8 @@ msgstr "Atualizações de Programas"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de "
 "segurança, e prover novas funcionalidades para você."
@@ -888,12 +956,10 @@ msgstr "Atualizações via Internet"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "Somente atualizações de segurança do servidor oficial do Ubuntu serão "
-"instaladas automaticamente. O pacote \"unattended-upgrades\" precisa ser "
-"instalado para isso."
+"instaladas automaticamente."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -952,7 +1018,6 @@ msgid "<b>Components:</b>"
 msgstr "<b>Componentes:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
 msgstr "<b>Componentes:</b>"
 
@@ -973,7 +1038,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Insira a linha completa do APT do canal que você quer adicionar</b></"
@@ -1032,10 +1097,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Checar automaticamente se uma nova versão da distribuição atual está "
+"disponível e oferecer a atualização (se possível)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Checar por novas versões da distribuição"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1071,9 +1138,8 @@ msgid "The window size"
 msgstr "O tamanho da janela"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Verificar os canais de software por novas atualizações"
+msgstr "Configurar os canais de software e atualizações via internet"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1191,6 +1257,23 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Enquanto analisava as informações de repositórios não foi encontrada uma "
+#~ "entrada válida para a atualização.\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Repositories changed"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Você precisa recarregar a lista de pacotes dos servidores para que suas "
+#~ "alterações tenham efeito. Você quer fazer isso agora?"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Seções</b>"
 
diff --git a/po/ro.po b/po/ro.po
index 12e99ac0..23b9549b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:24+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:32+0000\n"
 "Last-Translator: Dan Damian <dand@codemonkey.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Detalii</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "La fiecare %s zile"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, fuzzy, python-format
 msgid "Every %s days"
 msgstr "La fiecare %s zile"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -145,41 +175,72 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Citire cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -187,47 +248,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -235,21 +296,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Un alt manager de pachete rulează"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -257,45 +318,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Actualizare completă"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -303,44 +364,44 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Descarc modificările..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -348,7 +409,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -356,7 +417,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -364,41 +425,41 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sistemul dvs. este la zi!"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -603,7 +664,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Nu am putut descărca modificările. Vă rog să verificaţi dacă aveţi o "
 "conexiune internet activă."
@@ -624,98 +686,83 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versiunea %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Întrerupe descărcarea jurnalului de modificări"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Sistemul dvs. este la zi!"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, fuzzy, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nu pot instala '%s'"
+msgstr[1] "Nu pot instala '%s'"
+msgstr[2] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Detalii</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "Locaţiile au fost schimbate"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-"Informaţiile despre locaţii au fost schimbate. O copie de siguranţă a "
-"fişierului sources.list a fost salvată în %s.save.\n"
-"\n"
-"Pentru ca modificările să aibe efect, trebuie să reîncărcaţi lista de "
-"pachete de pe servere. Doriţi să faceţi acum acest lucru?"
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, fuzzy, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr "Versiune nouă: %s"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Distribuţia dvs. nu mai este suportată"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -732,10 +779,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -776,8 +823,8 @@ msgstr "Actualizări software"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -847,8 +894,7 @@ msgstr "<b>Actualizări de pe Internet</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -928,7 +974,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o "
@@ -1153,6 +1199,20 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
+#~ msgid "Repositories changed"
+#~ msgstr "Locaţiile au fost schimbate"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Informaţiile despre locaţii au fost schimbate. O copie de siguranţă a "
+#~ "fişierului sources.list a fost salvată în %s.save.\n"
+#~ "\n"
+#~ "Pentru ca modificările să aibe efect, trebuie să reîncărcaţi lista de "
+#~ "pachete de pe servere. Doriţi să faceţi acum acest lucru?"
+
 #, fuzzy
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Secţiuni:</b>"
diff --git a/po/rw.po b/po/rw.po
index ec26c03a..eaaac658 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:24+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:32+0000\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<B B"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -146,42 +175,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "i Urufunguzo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -189,47 +249,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -237,21 +297,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Muyobozi ni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -259,45 +319,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Byarangiye"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -305,99 +365,98 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Amahinduka"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 #, fuzzy
 msgid "Your system has already been upgraded."
 msgstr "Sisitemu"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -526,7 +585,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a "
+msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "Downloading the upgrade tool"
@@ -600,7 +659,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
 
@@ -619,95 +679,83 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:195
 #, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "OYA "
+msgstr "OYA"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, fuzzy, python-format
 msgid "Version %s: \n"
 msgstr "Verisiyo \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Iyimura... i"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Sisitemu ni Hejuru Kuri Itariki"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, fuzzy, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
+msgstr[0] "Sisitemu ni Hejuru Kuri Itariki"
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<B B"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-#, fuzzy
-msgid "Repositories changed"
-msgstr "Byahinduwe"
-
-#: ../UpdateManager/UpdateManager.py:587
-#, fuzzy
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr "Kubika."
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Verisiyo"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Ikwirakwiza... ni Oya"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -724,10 +772,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -751,7 +799,6 @@ msgid "Check the software channels for new updates"
 msgstr ""
 
 # #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
 msgstr "Isobanuramiterere"
@@ -770,8 +817,8 @@ msgstr "Ibihuzagihe bya porogaramumudasobwa"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -792,7 +839,6 @@ msgid "_Hide this information in the future"
 msgstr ""
 
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
 #: ../data/UpdateManager.glade.h:22
 #, fuzzy
 msgid "_Install Updates"
@@ -842,8 +888,7 @@ msgstr "<B B"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -926,7 +971,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<B i Byuzuye Umurongo Bya i Kuri Kongeramo B Umurongo Kirimo i Ubwoko Ahantu "
@@ -1151,6 +1196,16 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Repositories changed"
+#~ msgstr "Byahinduwe"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr "Kubika."
+
+#, fuzzy
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<B B"
 
@@ -1369,7 +1424,6 @@ msgstr ""
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PBM.FileFormat..0.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.PGM.FileFormat..0.text
 #~ msgid "Binary"
 #~ msgstr "Nyabibiri"
 
diff --git a/po/sk.po b/po/sk.po
index ab1d4d72..0c74f0e2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,28 +1,55 @@
 # Slovak translation for update-manager
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# Copyright (C) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# Peter Chabada <sk-i18n_chabada_sk>, 2006.
+#
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-07 00:57+0000\n"
-"Last-Translator: Martin Mancuska <borgcube@centrum.sk>\n"
-"Language-Team: Slovak <sk@li.org>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-30 22:14+0000\n"
+"Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
+"Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural= (n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "Denne"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "Každý druhý deň"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "Raz týždenne"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "Každý druhý týždeň"
 
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Každých %s dní"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "Po jednom týždni"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "Po dvoch týždňoch"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "Po mesiaci"
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -38,7 +65,7 @@ msgstr "Chyba pri importovaní vybraného súboru"
 
 #: ../SoftwareProperties/SoftwareProperties.py:433
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Vybraný súbor nemusí obsahovať GPG kľúč alebo môže byť poškodený."
+msgstr "Vybraný súbor nie je autentifikačným kľúčom GPG alebo je poškodený."
 
 #: ../SoftwareProperties/SoftwareProperties.py:445
 msgid "Error removing the key"
@@ -46,7 +73,7 @@ msgstr "Chyba pri odstraňovaní kľúča"
 
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr "Vybraný kľúč nemohol byť odstránený. Prosím, nahláste to ako bug."
+msgstr "Vybraný kľúč nebolo možné odstrániť. Nahláste to ako chybu."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -69,41 +96,41 @@ msgstr "Prosím, vložte disk do mechaniky:"
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr "Poškodené balíčky"
+msgstr "Poškodené balíky"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
-"Váš systém obsahuje poškodené balíčky, ktoré nemôžu byť týmto programom "
+"Váš systém obsahuje poškodené balíky, ktoré nemôžu byť týmto programom "
 "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr "Nemôžem upgradovať požadované meta-balíčky"
+msgstr "Nemôžem aktualizovať požadované meta-balíky"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr "Základný balíček by musel byt odstránený"
+msgstr "Musel by byť odstránený dôležitý balík"
 
 #. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr "Nemôžem vypočítať upgrade"
+msgstr "Nemôžem vypočítať aktualizáciu"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
 msgstr ""
-"Počas počítania upgradu sa vyskytol neriešiteľný problém. Prosím, nahláste "
-"to ako bug. "
+"Počas prípravy aktualizácie sa vyskytol neriešiteľný problém. Nahláste to "
+"ako chybu. "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
-msgstr "Chyba pri overovaní niektorých balíčkov"
+msgstr "Chyba pri overovaní niektorých balíkov"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
 msgid ""
@@ -111,8 +138,8 @@ msgid ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
-"Nebolo možné overiť niektoré balíčky. Mohlo to byť spôsobené prechodným "
-"problémom v sieti. Môžete to skúsiť neskôr. Nižšie je uvedený zoznam "
+"Nebolo možné overiť niektoré balíky. Mohlo by to byť spôsobené prechodným "
+"problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam "
 "neoverených balíčkov."
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
@@ -124,13 +151,12 @@ msgstr "Nemôžem inštalovať '%s'"
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr ""
-"Nebolo možné nainštalovať požadovaný balíček. Prosím, nahláste to ako bug. "
+msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
-msgstr "Nemôžem odhadnúť meta balíček."
+msgstr "Nemôžem odhadnúť meta balík."
 
 #: ../DistUpgrade/DistUpgradeCache.py:242
 msgid ""
@@ -140,180 +166,224 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Váš systmém neobsahuje žiadny balíčkov ubuntu-desktop, kubuntu-desktop alebo "
-"edubuntu-desktop a nebolo možné zistiť akú verziu ubuntu používate.\n"
-" Prosím, pred pokračovaním nainštalujte jeden z vyššie uvedených balíčkov "
-"pomocou synapticu alebo apt-get."
+"Váš systém neobsahuje žiadny z balíkov ubuntu-desktop, kubuntu-desktop alebo "
+"edubuntu-desktop a nebolo možné zistiť akú verziu Ubuntu používate.\n"
+"Pred pokračovaním nainštalujte jeden z vyššie uvedených balíkov pomocou "
+"Synapticu alebo apt-get."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
-msgstr "Čítam cache"
+msgstr "Čítam vyrovnávaciu pamäť cache"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr "Nebol nájdený vhodný server"
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+"Počas čítania informácií o zdrojoch softvéru nebol nájdený žiadny vhodný "
+"server. Toto sa môže stať ak prevádzkujete vlastný server poskytujúci "
+"inštalačné balíky, alebo keď zoznam serverov je zastaraný.\n"
+"\n"
+"Chcete aj napriek tomu prepísať súbor 'sources.list'? Ak zvolíte 'Áno' budú "
+"nahradené všetky '%s' záznamy '%s' záznamami.\n"
+"Pokiaľ zvolíte 'Nie', súbor nebude zmenený."
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Nebol nájdený žiadny platný záznam"
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
-"Počas skenovania vašich zdrojov nebol nájdený žiadny platný záznam pre "
-"upgrade.\n"
+"Počas čítania súboru 'sources.list' nebol nájdený žiadny platný záznam pre '%"
+"s'.\n"
+"\n"
+"Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor "
+"nebude zmenený."
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
-msgstr "Neplatná informácia zdroja"
+msgstr "Neplatná informácia o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
-"Upgradovanie informácii o zdroji vrátilo neplatný súbor. Prosím, nahláste to "
-"ako bug."
+"Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. "
+"Nahláste to ako chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Chyba počas aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
-"Počas aktualizácie sa objavil problém. Toto je zvyčajne spôsobené chybou "
-"sieťového pripojenia, preto prosím skontrolujte vaše pripojenie a opakujte."
+"Počas aktualizácie sa objavil problém, ktorý je zvyčajne spôsobený chybou "
+"sieťového pripojenia, preto skontrolujte vaše pripojenie a skúste znova."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Nedostatok voľného miesta na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
-"Upgrade neočakávane skončil. Prosím, uvoľnite najmenej %s miesta na disku. "
-"Vyprázdnite váš kôš a odstráňte dočasné balíčky z predchádzajúcich "
-"inštalácií použitím 'sudo apt-get clean'."
+"Aktualizácia bola neočakávane prerušená. Uvoľnite aspoň %s miesta na disku. "
+"Vyprázdnite kôš a odstráňte dočasné balíky z predchádzajúcich inštalácií "
+"použitím 'sudo apt-get clean'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
-msgstr "Chcete začať upgrade?"
+msgstr "Chcete začať s aktualizáciou?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr "Nemožno nainštalovať upgrady"
+msgstr "Nebolo možné nainštalovať aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
-"Upgrade neočakávane skončil. Váš systém môže byt v nestabilnom stave. Pre "
-"opravu skúste teraz spustiť (dpkg --configure -a)."
+"Aktualizácia teraz skončí. Váš systém môže byť v nepoužiteľnom stave, preto "
+"bol spustený príkaz na zotavenie sa z tohto stavu (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr "Nemožno stiahnuť upgrady"
+msgstr "Nebolo možné stiahnuť požadované balíky"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"Upgrade neočakávane skončil. Prosím, skontrolujte vaše internetové "
+"Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové "
 "pripojenie alebo inštalačné médiá a skúste znova. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
-msgstr "Odstrániť zastaralé balíčky?"
+msgstr "Odstrániť zastarané balíky?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Preskočiť tento krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
-msgstr "Chyba počas zaznamenávania"
+msgstr "Chyba počas potvrdzovania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
-"Počas čistenia sa vyskytli nejaké problémy. Prosím, pre viac informácií si "
-"pozrite nižšie správu. "
+"Počas čistenia sa vyskytli problémy. Pre viac informácií si pozrite nižšie "
+"uvedené správy. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
-msgstr "Kontrolovanie balíčkovacieho manažéra"
+msgstr "Kontrola správcu balíkov"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
-msgstr "Aktualizácia informácií o zdroji"
+msgstr "Aktualizácia informácií o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "Neplatná informácia o balíkoch"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
 "This indicates a serious error, please report this as a bug."
 msgstr ""
+"Po aktualizácií informácií o balíkoch nie je možné nájsť dôležitý balík '%"
+"s'.\n"
+"To znamená závažný problém. Nahláste to ako chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Požaduje sa potvrdenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
-msgstr "Upgradovanie"
+msgstr "Prebieha aktualizácia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr "Vyhľadávanie zastaralého softwaru"
+msgstr "Vyhľadávanie zastaraného softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
-msgstr "Upgrade systému je kompletný."
+msgstr "Aktualizácia systému je dokončená."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Prosím, vložte '%s' do mechaniky '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Sťahovanie je dokončené"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Sťahovanie súboru %li z %li pri %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "Zostáva %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Sťahujem %li súbor z %li"
@@ -321,21 +391,21 @@ msgstr "Sťahujem %li súbor z %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "Aplikujem zmeny"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Nemožno nainštalovať '%s'"
+msgstr "Nebolo možné nainštalovať '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "Upgrade zlyhal. Prosím, oznámte to ako bug."
+msgstr "Aktualizácia zlyhala. Oznámte to ako chybu."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -344,96 +414,99 @@ msgstr ""
 "Nahradiť konfiguračný súbor\n"
 "'%s'?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Príkaz 'diff' nebol nájdený."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
-msgstr "Objavila sa závažná chyba"
+msgstr "Nastala závažná chyba"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Prosím, oznámte toto ako bug a ku vašej správe priložte súbory ~/dist-"
-"upgrade.log a ~/dist-upgrade-apt.log. Upgrade teraz skončí. "
+"Nahláste to ako chybu a k svojmu hláseniu priložte súbory /var/log/dist-"
+"upgrade.log a /var/log/dist-upgrade-apt.log. Aktualizácia bude teraz "
+"prerušená.\n"
+"Váš pôvodný súbor 'sources.list' bol uložený ako /etc/apt/sources.list."
+"distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] "balíček %s bude odstránený."
-msgstr[1] "balíčky %s budú odstránené."
-msgstr[2] ""
+msgstr[0] "Bude odstránený %s balík."
+msgstr[1] "Budú odstránené %s balíky."
+msgstr[2] "Bude odstránených %s balíkov."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] "nový balíček %s bude nainštalovaný."
-msgstr[1] "nové balíčky %s budú nainštalované."
-msgstr[2] ""
+msgstr[0] "Bude nainštalovaný %s nový balík."
+msgstr[1] "Budú nainštalované %s nové balíky."
+msgstr[2] "Bude nainštalovaných %s nových balíkov."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] "balíček %s bude upgradovaný."
-msgstr[1] "balíčky %s budú upgradované."
-msgstr[2] ""
+msgstr[0] "Bude aktualizovaný %s balík."
+msgstr[1] "Budú aktualizované %s balíky."
+msgstr[2] "Bude aktualizovaných %s balíkov."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Musíte stiahnuť celkom %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
-msgstr "Upgrade môže trvať niekoľko hodín a nemôže byť neskôr zrušený."
+msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
-"Pre zamedzenie straty dát, zavrite všetky otvorené aplikácie a dokumenty."
+"Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr "Nemôžno nájsť žiadne upgrady"
+msgstr "Nemôžno nájsť žiadne aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
-msgstr "Váš systém bol už upgradovaný."
+msgstr "Váš systém už bol aktualizovaný."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Odstrániť %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Inštalovať %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr "Upgradovať %s"
+msgstr "Aktualizovať %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
-msgstr "Je vyžadovaný reštart"
+msgstr "Je potrebný reštart"
 
 #: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"Upgrade bol dokončený a je potrebné reštartovať. Chcete reštartovať teraz?"
+"Bola dokončená aktualizácia a je potrebné reštartovať počítač. Chcete "
+"vykonať reštart teraz?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -451,26 +524,26 @@ msgid ""
 "The system could be in an unusable state if you cancel the upgrade. You are "
 "strongly adviced to resume the upgrade."
 msgstr ""
-"<b><big>Zrušiť prebiehajúci upgrade?</big></b>\n"
+"<b><big>Zrušiť prebiehajúcu aktualizáciu?</big></b>\n"
 "\n"
-"Ak zrušíte upgrade, systém by mohol byť v nestabilnom stave. Je silne "
-"odporúčané pokračovať v upgrade."
+"Ak prerušíte aktualizáciu, systém môže zostať v nestabilnom stave. Je "
+"dôrazne odporúčané pokračovať v aktualizácii."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr "<b><big>Pre dokončenie upgradu reštartujte systém</big></b>"
+msgstr "<b><big>Na dokončenie aktualizácie reštartujte počítač</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Spustiť upgrade?</big></b>"
+msgstr "<b><big>Spustiť aktualizáciu?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
-"<span weight=\"bold\" size=\"x-large\">Upgraduje sa na Ubuntu \"Dapper\" "
-"6.06</span>"
+"<span weight=\"bold\" size=\"x-large\">Prebieha aktualizácia na Ubuntu "
+"\"Dapper\" 6.06</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -478,7 +551,7 @@ msgstr "Prebieha čistenie"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr "Detaily"
+msgstr "Podrobnosti"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
@@ -486,15 +559,15 @@ msgstr "Rozdiel medzi súbormi"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr "Sťahovanie a inštalovanie upgradov"
+msgstr "Sťahovanie a inštalovanie aktualizácií"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Modifikujú sa programové kanály"
+msgstr "Upravujú sa zdoje softvéru"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "Pripravovanie upgradu"
+msgstr "Prebieha príprava aktualizácie"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
@@ -506,7 +579,7 @@ msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr "Upgraduje sa Ubuntu"
+msgstr "Aktualizuje sa Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
@@ -526,120 +599,123 @@ msgstr "_Reštartovať teraz"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr "_Pokračovať v upgrade"
+msgstr "_Pokračovať v aktualizácii"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Nemôžno nájsť žiadne upgrady"
+msgstr "Nebolo možné nájsť poznámky k vydaniu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Server môže byť preťažený. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Nemožno stiahnuť upgrady"
+msgstr "Nebolo možné stiahnuť poznámky k vydaniu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Skontrolujte si internetové pripojenie."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Nemožno nainštalovať upgrady"
+msgstr "Nebolo možné spustiť aktualizačný program"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Počas počítania upgradu sa vyskytol neriešiteľný problém. Prosím, nahláste "
-"to ako bug. "
+"Pravdepodobne je to chyba v aktualizačnom programe. Nahláste to ako chybu."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Sťahovanie a inštalovanie upgradov"
+msgstr "Sťahovanie aktualizačného programu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Aktualizačný program vás prevedie procesom aktualizácie."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Podpis aktualizačného programu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Upgradovať %s"
+msgstr "Aktualizačný program"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Zlyhalo získavanie aktualizácie"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Zlyhalo získavanie aktualizácie, čo môže byť spôsobené sieťovým problémom. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Zlyhala extrakcia"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Nebolo možné rozbaliť aktualizáciu. Môže to byť spôsobené sieťovým problémom "
+"alebo nedostupňosťou servera. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "Zlyhala verifikácia"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Zlyhala verifikácia aktualizácie. Môže to byť spôsobené sieťovým problémom "
+"alebo nedostupňosťou servera. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
 msgid "Authentication failed"
-msgstr ""
+msgstr "Autentifikácia zlyhala"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Zlyhalo overenie autenticity aktualizácie. Môže to byť spôsobené sieťovým "
+"problémom alebo nedostupňosťou servera. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Sťahovanie súboru %li z %li pri %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Sťahovanie súboru %li z %li pri %s/s"
+msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
+"Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové "
+"pripojenie."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Nemožno nainštalovať upgrady"
+msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -647,102 +723,102 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Niektoré aktualizácie vyžadujú odstránenie iných programov. Aby ste vykonali "
+"úplnú aktualizáciu použite funkciu \"Označiť všetky aktualizácie\" správcu "
+"balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade\" v "
+"termináli."
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "Nasledujúce balíky nebudú aktualizované:"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "Verzia %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Sťahujem %li súbor z %li"
+msgstr "Získava sa zoznam zmien..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Veľkosť na stiahnutie: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "Váš systém je aktuálny"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Nemožno nainštalovať upgrady"
-msgstr[1] "Nemožno nainštalovať upgrady"
-msgstr[2] "Nemožno nainštalovať upgrady"
+msgstr[0] "Môžete nainštalovať %s aktualizáciu"
+msgstr[1] "Môžete nainštalovať %s aktualizácie"
+msgstr[2] "Môžete nainštalovať %s aktualizácií"
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Zobraziť podrobnosti"
+msgstr "Skryť podrobnosti"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Zobraziť podrobnosti"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Čakajte prosím, toto môže chvíľu trvať."
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Sťahovanie je dokončené"
+msgstr "Aktualizácia je dokončená"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "Nová verzia: %s   (veľkosť: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "Vaša distribúcia už nie je podporovaná"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Nebudete mať k dispozícii žiadne nové bezpečnostné ani kritické "
+"aktualizácie. Prejdite preto na najnovšiu verziu distribúcie Ubuntu Linux. "
+"Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu."
+"com.\""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Naraz môže byť spustený len jeden program na správu softvéru"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
+"Musíte najprv zavrieť ostatné programy na správu softvéru, ako napr. "
+"'aptitude' alebo 'Synaptic'."
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Index softvéru je poškodený"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"V dôsledku chyby nie je možné nainštalovať alebo odstrániť žiadny program. "
+"Na odstránenie tohto problému použite správcu balíkov 'Synaptic' alebo "
+"spustite 'sudo apt-get install -f' v termáli."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -751,22 +827,31 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>Musíte kontrolovať aktualizácie·manuálne</big></b>\n"
+"\n"
+"Váš systém je nastavený aby nekontroloval aktualizácie automaticky. Toto "
+"správanie môžete nastaviť v ponuke menu 'Systém' -> 'Správa' -> 'Vlastnosti "
+"softvéru'."
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
+"<big><b>Analyzuje sa váš systém</b></big>\n"
+"\n"
+"Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné "
+"zraniteľnosti alebo poskytujú nové vlastnosti."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Udržujte si systém v aktuálnom stave</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "_Zrušiť sťahovanie"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
@@ -774,11 +859,11 @@ msgstr "Zmeny"
 
 #: ../data/UpdateManager.glade.h:10
 msgid "Chec_k"
-msgstr ""
+msgstr "_Skontrolovať"
 
 #: ../data/UpdateManager.glade.h:11
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Skontrolovať, či zdroje softvéru neobsahujú nové aktualizácie"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -790,104 +875,107 @@ msgstr "Poznámky k vydaniu"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Zobraziť priebeh jednotlivých súborov"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
-msgstr ""
+msgstr "Aktualizácie softvéru"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
+"Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné "
+"zraniteľnosti alebo poskytujú nové vlastnosti."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
-msgstr ""
+msgstr "_Aktualizovať"
 
 #: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Aktualizovať na najnovšiu verziu Ubuntu"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr ""
+msgstr "_Skontrolovať"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Túto správu už viac nezobrazovať"
 
 #: ../data/UpdateManager.glade.h:22
 msgid "_Install Updates"
-msgstr ""
+msgstr "Nainštalovať _aktualizácie"
 
 #: ../data/SoftwareProperties.glade.h:1
 msgid "<b>Channels</b>"
-msgstr ""
+msgstr "<b>Zdroje</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
 msgid "<b>Internet updates</b>"
-msgstr ""
+msgstr "<b>Internetové aktualizácie</b>"
 
 #: ../data/SoftwareProperties.glade.h:3
 msgid "<b>Keys</b>"
-msgstr ""
+msgstr "<b>Kľúče</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "Pridať _CD"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
-msgstr ""
+msgstr "Autentifikácia"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Zmazať stiahnuté inštalačné balíčky:"
 
 #: ../data/SoftwareProperties.glade.h:7
 msgid "Import the public key from a trusted software provider"
-msgstr ""
+msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
-msgstr ""
+msgstr "Inštalačné média"
 
 #: ../data/SoftwareProperties.glade.h:9
 msgid "Internet Updates"
-msgstr ""
+msgstr "Internetové aktualizácie"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
+"Automaticky budú inštalované iba bezpečnostné aktualizácie z oficiálnych "
+"Ubuntu serverov."
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
-msgstr ""
+msgstr "_Obnoviť predvolené"
 
 #: ../data/SoftwareProperties.glade.h:12
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Obnoviť pôvodné kľúče distribúcie"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
-msgstr ""
+msgstr "Predvoľby softvéru"
 
 #: ../data/SoftwareProperties.glade.h:14
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Kontrolovať aktualizácie:"
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgstr "_Stiahnuť aktualizácie automaticky, no neinštalovať ich"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
@@ -902,96 +990,112 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>Informácie o dostupných programoch sú neaktuálne</big></b>\n"
+"\n"
+"Aby ste mohli nainštalovať softvér alebo aktualizácie z novopridaných "
+"zdrojov musíte znovunačítať zoznam dostupných balíkov zo serverov uvedených "
+"vo vašich zdrojoch softvéru.\n"
+"\n"
+"Potrebujete na to funkčné internetové pripojenie."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Channel</b>"
-msgstr ""
+msgstr "<b>Zdroj:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
-msgstr ""
+msgstr "<b>Komentár:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>Components:</b>"
-msgstr ""
+msgstr "<b>Súčasti:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Odstrániť %s</b>"
+msgstr "<b>Súčasti:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
-msgstr ""
+msgstr "<b>Distribúcia:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
-msgstr ""
+msgstr "<b>Typ:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
-msgstr ""
+msgstr "<b>Adresa:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
+"<big><b>Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete pridať</"
+"b></big>\n"
+"\n"
+"APT riadok obsahuje typ, umiestnenie a súčasti zdrojov softvéru. Napr.: <i>"
+"\"deb·http://ftp.debian.org·sarge·main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
-msgstr ""
+msgstr "APT riadok:"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "Pridať zdroj"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"Binárny\n"
+"Zdrojový"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "Upraviť zdroje"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Prehľadáva sa CD"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
+#, fuzzy
 msgid "_Add Channel"
-msgstr ""
+msgstr "_Pridať zdroj"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr ""
+msgstr "_Vlastný"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
 msgid "_Reload"
-msgstr ""
+msgstr "_Obnoviť"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Zobraziť a nainštalovať dostupné aktualizácie"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr ""
+msgstr "Správca aktualizácií"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Automaticky kontrolovať dostupnosť novšej verzie súčasnej distribúcie, a ak "
+"je to možné ponúknuť možnosť jej aktualizácie."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Kontrolovať dostupnosť novšej verzie distribúcie"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -999,24 +1103,28 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"Ak je automatická kontrola aktualizácií vypnutá, musíte manuálne "
+"znovunačítavať zoznam dostupných balíkov zo serverov uvedených vo vašich "
+"zdrojoch softvéru. Táto voľba vám umožní nezobrazovať upozorňovanie na "
+"potrebu znovunačítavania tohto zoznamu."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Pripomínať znovunačítavanie zoznamu dostupných balíčkov"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Zobraziť podrobnosti o aktualizácii"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Uchováva veľkosť dialágu správcu aktualizácií"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
-msgstr ""
+msgstr "Uchováva veľkosť časti okna so zoznamom zmien a popisom balíka"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
@@ -1024,120 +1132,465 @@ msgstr "Veľkosť okna"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure software channels and internet updates"
-msgstr ""
+msgstr "Nastaviť zdroje softvéru a internetové aktualizácie"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
-msgstr ""
+msgstr "Vlastnosti softvéru"
 
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
 msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr ""
+msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
 msgid "Ubuntu 6.06 Security Updates"
-msgstr ""
+msgstr "Ubuntu 6.06 - bezpečnostné aktualizácie"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
 msgid "Ubuntu 6.06 Updates"
-msgstr ""
+msgstr "Ubuntu 6.06 - aktualizácie"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
 msgid "Ubuntu 6.06 Backports"
-msgstr ""
+msgstr "Ubuntu 6.06 - backporty"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../channels/Ubuntu.info.in:91
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
 #: ../channels/Ubuntu.info.in:108
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 - backporty"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr ""
+msgstr "Oficiálne podporované"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
-msgstr ""
+msgstr "S obmedzujúcou licenciou"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:134
 msgid "Community maintained (Universe)"
-msgstr ""
+msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:137
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Neslobodné (Multiverse)"
 
 #. ChangelogURI
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
 #. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\" - bezpečnostné aktualizácie"
 
 #. Description
 #: ../channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testing)"
 
 #. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére"
 
 #. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Softvér nekompatibilný s DFSG"
+
+#~ msgid "No valid entry found"
+#~ msgstr "Nebol nájdený žiadny platný záznam"
+
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Vo vašich zdrojoch softvéru nebol nájdený žiadny záznam vhodný na "
+#~ "použitie pre upgrade.\n"
+
+#~ msgid ""
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery is now run (dpkg --configure -a)."
+#~ msgstr ""
+#~ "Upgrade neočakávane skončil. Váš systém môže byt v nestabilnom stave. Pre "
+#~ "opravu skúste teraz spustiť (dpkg --configure -a)."
+
+#~ msgid ""
+#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
+#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
+#~ msgstr ""
+#~ "Oznámte ju ako chybu a k vašej správe priložte súbory ~/dist-upgrade.log "
+#~ "a ~/dist-upgrade-apt.log. Upgrade teraz skončí. "
+
+#~ msgid "You can install one update"
+#~ msgid_plural "You can install %s updates"
+#~ msgstr[0] "Môžete nainštalovať %s aktualizáciu"
+#~ msgstr[1] "Môžete nainštalovať %s aktualizácie"
+#~ msgstr[2] "Môžete nainštalovať %s aktualizácií"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Zdroje softvéru boli zmenené"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Potrebujete znovunačítať zoznam dostupných balíčkov zo serverov uvedených "
+#~ "vo vašich zdrojoch softvéru. Chcete to urobiť teraz?"
+
+#~ msgid ""
+#~ "<big><b>Analysing your system</b></big>\n"
+#~ "\n"
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ msgstr ""
+#~ "<big><b>Analyzuje sa váš systém</b></big>\n"
+#~ "\n"
+#~ "Softvérové aktualizácie môžu opravovať chyby, odstraňovať bezpečnostné "
+#~ "zraniteľnosti alebo poskytnúť nové vlastnosti."
+
+#~ msgid ""
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ msgstr ""
+#~ "Softvérové aktualizácie môžu opravovať chyby, odstraňovať bezpečnostné "
+#~ "zraniteľnosti alebo poskytnúť nové vlastnosti."
+
+#~ msgid ""
+#~ "Only security updates from the official Ubuntu servers will be installed "
+#~ "automatically. The software package \"unattended-upgrades\" needs to be "
+#~ "installed therefor"
+#~ msgstr ""
+#~ "Automaticky budú inštalované len bezpečnostné aktualizácie z oficiálnych "
+#~ "serverov Ubuntu. Preto musí byť nainštalovaný softvérový balíček "
+#~ "'unattended-upgrades'."
+
+#~ msgid "<b>Sections</b>"
+#~ msgstr "<b>Sekcie:</b>"
+
+#~ msgid ""
+#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
+#~ "b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and sections of a channel, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+#~ msgstr ""
+#~ "<big><b>Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete "
+#~ "pridať</b></big>\n"
+#~ "\n"
+#~ "APT riadok obsahuje typ, umiestnenie a sekcie zdrojov softvéru. Napr.: <i>"
+#~ "\"deb·http://ftp.debian.org·sarge·main\"</i>."
+
+#~ msgid "<b>Sections:</b>"
+#~ msgstr "<b>Sekcie:</b>"
+
+#~ msgid "Oficially supported"
+#~ msgstr "Oficiálne podporované"
+
+#~ msgid "Edit software sources and settings"
+#~ msgstr "Upraviť zdroje a nastavenia softvéru"
+
+#~ msgid "<b>Sources</b>"
+#~ msgstr "<b>Zdroje</b>"
+
+#~ msgid "day(s)"
+#~ msgstr "deň/dní"
+
+#~ msgid "<b>Temporary files</b>"
+#~ msgstr "<b>Dočasné súbory</b>"
+
+#~ msgid "<b>User Interface</b>"
+#~ msgstr "<b>Používateľské rozhranie</b>"
+
+#~ msgid ""
+#~ "<big><b>Authentication keys</b></big>\n"
+#~ "\n"
+#~ "You can add and remove authentication keys in this dialog. A key makes it "
+#~ "possible to verify the integrity of the software you download."
+#~ msgstr ""
+#~ "<big><b>Autentifikačné kľúče</b></big>\n"
+#~ "\n"
+#~ "V tomto dialógu môžete pridať alebo odstrániť autentifikačné kľúče. Kľúč "
+#~ "umožňuje overiť integritu stiahnutého softvéru."
+
+#~ msgid ""
+#~ "Add a new key file to the trusted keyring. Make sure that you received "
+#~ "the key over a secure channel and that you trust the owner. "
+#~ msgstr ""
+#~ "Pridať nový kľúč do zväzku dôveryhodných kľúčov. Uistite sa, že ste kľúč "
+#~ "dostali bezpečnou cestou, a že môžete veriť jeho vydavateľovi. "
+
+#~ msgid "Add repository..."
+#~ msgstr "Pridať repozitár..."
+
+#~ msgid "Automatically check for software _updates."
+#~ msgstr "_Automaticky kontrolovať aktualizácie softvéru"
+
+#~ msgid "Automatically clean _temporary packages files"
+#~ msgstr "Automati_cky prečistiť stiahnuté balíky"
+
+#~ msgid "Clean interval in days: "
+#~ msgstr "Intervel prečistenia (v dňoch): "
+
+#~ msgid "Delete _old packages in the package cache"
+#~ msgstr "Zmazať staré balíky z archívu na pevnom disku"
+
+#~ msgid "Edit Repository..."
+#~ msgstr "Upraviť repozitáre..."
+
+#~ msgid "Maximum age in days:"
+#~ msgstr "Uchovávať balíky najviac (v dňoch):"
+
+#~ msgid "Maximum size in MB:"
+#~ msgstr "Maximálna veľkosť archívu na disku (v MB):"
+
+#~ msgid ""
+#~ "Restore the default keys shipped with the distribution. This will not "
+#~ "change user installed keys."
+#~ msgstr ""
+#~ "Obnoví pôvodné kľúče dodávané s vašou distribúciou. Toto neovplyvní "
+#~ "používateľom nainštalovnané kľúče."
+
+#~ msgid "Set _maximum size for the package cache"
+#~ msgstr "Nastaviť maximálnu veľkosť archívu balíčkov na disku"
+
+#~ msgid "Settings"
+#~ msgstr "Nastavenia"
+
+#~ msgid "Show detailed package versions"
+#~ msgstr "Zobraziť podrovné informácie o verziách balíkov"
+
+#~ msgid "Show disabled software sources"
+#~ msgstr "Zobraziť vypnuté zroje softvéru"
+
+#~ msgid "Update interval in days: "
+#~ msgstr "Interval aktualizácie v dňoch: "
+
+#~ msgid "_Add Repository"
+#~ msgstr "_Pridať repozitár"
+
+#~ msgid "_Download upgradable packages"
+#~ msgstr "_Stiahnuť nájdené aktualizácie"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Stav:</b>"
+
+#~ msgid ""
+#~ "<big><b>Available Updates</b></big>\n"
+#~ "\n"
+#~ "The following packages are found to be upgradable. You can upgrade them "
+#~ "by using the Install button."
+#~ msgstr ""
+#~ "<big><b>Dostupné aktualizácie</b></big>\n"
+#~ "\n"
+#~ "Boli nájdené aktualizácie nasledovných balíkov. Môžete ich zaktualizovať "
+#~ "použitím tlačidla Inštalovať."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Získava sa zoznam zmien</span>\n"
+#~ "\n"
+#~ "Zoznam zmien sa získava z centrálneho servera."
+
+#~ msgid "Cancel downloading the changelog"
+#~ msgstr "Zrušiť získavanie zoznamu zmien"
+
+#~ msgid "Reload the package information from the server."
+#~ msgstr "Znovu načítať informácie o balíkoch zo serverov."
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Zobraziť dostupné aktualizácie a vybrať, ktoré nainštalovať"
+
+#~ msgid "You need to be root to run this program"
+#~ msgstr ""
+#~ "Aby ste mohli spustiť tento program musíte mať administrátorské práva"
+
+#~ msgid "Binary"
+#~ msgstr "Binárny"
+
+#~ msgid "Source"
+#~ msgstr "Zdrojový"
+
+#~ msgid "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\""
+#~ msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+
+#~ msgid "Ubuntu 4.10 Security Updates"
+#~ msgstr "Ubuntu 4.10 bezpečnostné aktualizácie"
+
+#~ msgid "Ubuntu 4.10 Updates"
+#~ msgstr "Ubuntu 4.10 aktualizácie"
+
+#~ msgid "Contributed software"
+#~ msgstr "Softvér závislý na neslobornom softvéri"
+
+#~ msgid "Non-free software"
+#~ msgstr "Neslobodný softvér"
+
+#~ msgid "US export restricted software"
+#~ msgstr "Softvér s obmedzených exportom pre USA"
+
+#~ msgid "Debian 3.0 \"Woody\""
+#~ msgstr "Debian 3.0 \"Woody\""
+
+#~ msgid "Debian Stable"
+#~ msgstr "Debian Stable"
+
+#~ msgid "Debian Unstable \"Sid\""
+#~ msgstr "Debian Unstable \"Sid\""
+
+#~ msgid "Debian Non-US (Stable)"
+#~ msgstr "Debian Non-US (Stable)"
+
+#~ msgid "Debian Non-US (Testing)"
+#~ msgstr "Debian Non-US (Testing)"
+
+#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#~ msgstr "Autentifikačný kľúč Ubuntu archívu <ftpmaster@ubuntu.com>"
+
+#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ msgstr "Autentifikačný kľúč Ubuntu CD <cdimage@ubuntu.com>"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Vyberte súbor s autentifikačným kľúčom"
+
+#~ msgid "There is one package available for updating."
+#~ msgstr "Bol nájdený jeden balík, ktorý je možné aktualizovať."
+
+#~ msgid "There are %s packages available for updating."
+#~ msgstr "Bolo nájdených %s balíkov, ktoré je možné aktualizovať."
+
+#~ msgid "There are no updated packages"
+#~ msgstr "Nebol nájdený žiadny balík, ktorý by bolo potrebné aktualizovať."
+
+#~ msgid "You did not select any of the %s updated package"
+#~ msgid_plural "You did not select any of the %s updated packages"
+#~ msgstr[0] "Nevybrali ste balík na aktualizáciu (%s dostupný)."
+#~ msgstr[1] "Nevybrali ste žiadny balík na aktualizáciu z %s dostupných."
+#~ msgstr[2] "Nevybrali ste žiadny balík na aktualizáciu z %s dostupných."
+
+#~ msgid "You have selected %s updated package, size %s"
+#~ msgid_plural "You have selected all %s updated packages, total size %s"
+#~ msgstr[0] "Vybrali ste %s balík na aktualizáciu, veľkosť %s"
+#~ msgstr[1] "Vybrali ste %s balíky na aktualizáciu, veľkosť %s"
+#~ msgstr[2] "Vybrali ste %s balíkov na aktualizáciu, veľkosť %s"
+
+#~ msgid "You have selected %s out of %s updated package, size %s"
+#~ msgid_plural ""
+#~ "You have selected %s out of %s updated packages, total size %s"
+#~ msgstr[0] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s"
+#~ msgstr[1] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s"
+#~ msgstr[2] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s"
+
+#~ msgid "The updates are being applied."
+#~ msgstr "Práve prebieha aktualizácia."
+
+#~ msgid ""
+#~ "You can run only one package management application at the same time. "
+#~ "Please close this other application first."
+#~ msgstr ""
+#~ "Môžete mať spustenú najviac jednu aplikáciu na správu balíkov. Prosím, "
+#~ "najprv zavrite druhú aplikáciu."
+
+#~ msgid "Updating package list..."
+#~ msgstr "Aktualizujem zoznam balíkov..."
+
+#~ msgid "Checking for updates..."
+#~ msgstr "Kontrolujem aktualizácie..."
+
+#~ msgid "There are no updates available."
+#~ msgstr "Nie sú dostupné žiadne aktualizácie."
+
+#~ msgid ""
+#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
+#~ "running will no longer get security fixes or other critical updates. "
+#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#~ msgstr ""
+#~ "Prejdite prosím, na novšiu verziu distribúcie Ubuntu Linux. Verzia, ktorú "
+#~ "používate nie je viac podporovaná. To znamená, že už nie sú k dispozícii "
+#~ "bezpečnostné ani kritické aktualizácie. Pre viac informácií o prechode na "
+#~ "novšiu verziu si pozrite http://www.ubuntulinux.org."
+
+#~ msgid "There is a new release of Ubuntu available!"
+#~ msgstr "Bola nájdená novšia verzia Ubuntu!"
+
+#~ msgid ""
+#~ "A new release with the codename '%s' is available. Please see http://www."
+#~ "ubuntulinux.org/ for upgrade instructions."
+#~ msgstr ""
+#~ "Je dostupná novšia verzia vašej distribúcie s kódovým označením \"%s\". "
+#~ "Pre viac informácií o prechode na vyššiu verziu si pozrite http://www."
+#~ "ubuntulinux.org."
+
+#~ msgid "Never show this message again"
+#~ msgstr "Už viac nezobrazovať toto upozornenie"
+
+#~ msgid "Changes not found, the server may not be updated yet."
+#~ msgstr ""
+#~ "Zoznam zmien nebol nájdený. Je možné, že ešte neboli nahrané na server."
+
+#~ msgid "A_uthentication"
+#~ msgstr "A_utentifikácia"
+
+#~ msgid "<b>Software Sources</b>"
+#~ msgstr "<b>Zdroje softvéru</b>"
+
+#~ msgid "<b>Packages to install:</b>"
+#~ msgstr "<b>Balíky na inštaláciu:</b>"
diff --git a/po/sv.po b/po/sv.po
index af58ecfa..c7d9ef23 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-09 20:09+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 12:55+0000\n"
 "Last-Translator: Christian Bjälevik <nafallo@magicalforest.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,10 +17,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
-msgstr "Var %s dag"
+msgstr "Var %s:e dag"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
@@ -47,7 +75,7 @@ msgstr "Fel vid borttagning av nyckeln"
 #: ../SoftwareProperties/SoftwareProperties.py:446
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Nyckeln du valde kan inte tas bort. Var vänlig rapportera detta som en bugg."
+"Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg."
 
 #: ../SoftwareProperties/SoftwareProperties.py:487
 #, python-format
@@ -62,7 +90,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:544
 msgid "Please enter a name for the disc"
-msgstr "Skriv in namnet för skivan"
+msgstr "Skriv in ett namn på skivan"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
@@ -77,8 +105,8 @@ msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
-"Ditt system innehåller trasiga paket som inte kunde repareras med denna "
-"programvara. Reparera dem först med synaptic eller apt-get innan du "
+"Ditt system innehåller trasiga paket som inte kunde repareras med det här "
+"programmet. Reparera dem först med synaptic eller apt-get innan du "
 "fortsätter."
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
@@ -127,7 +155,7 @@ msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Det var inte möjligt att installera ett obligatoriskt paket. Var vänlig "
+"Det var inte möjligt att installera ett nödvändigt paket. Var vänlig "
 "rapportera detta som en bugg. "
 
 #. FIXME: provide a list
@@ -143,33 +171,51 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Ditt system innehåller inte ubuntu-desktop, kubuntu-desktop eller edubuntu-"
-"desktop och det var inte möjligt att upptäcka vilken version av ubuntu du "
+"Ditt system innehåller varken ubuntu-desktop, kubuntu-desktop eller edubuntu-"
+"desktop och det gick inte att upptäcka vilken version av ubuntu du "
 "använder.\n"
-" Var god installera ett av paketen ovan genom synaptic eller apt-get innan "
-"du fortsätter."
+" Installera ett av dessa paket med synaptic eller apt-get innan du "
+"fortsätter."
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
 msgstr "Läser cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
-msgstr "Ingen giltig källa funnen"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
-"Ingen giltig källa för uppdatering hittades när din förrådsinformation "
-"söktes igenom.\n"
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Information om förråd ogiltig"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -177,11 +223,22 @@ msgstr ""
 "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig "
 "rapportera detta som en bugg."
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "Fel vid uppdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -190,11 +247,11 @@ msgstr ""
 "av nätverksproblem, var god kontrollera din nätverksanslutning och försök "
 "igen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Inte tillräckligt med ledigt diskutrymme"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -202,31 +259,28 @@ msgid ""
 "get clean'."
 msgstr ""
 "Uppdateringen avbryter nu. Vänligen frigör minst %s diskutrymme. Töm din "
-"papperskorg och ta bort temporära paket från tidigare uppdateringar genom "
+"papperskorg och ta bort temporära paket från tidigare installationer genom "
 "att köra \"sudo apt-get clean\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Vill du starta uppdateringen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr "Det gick inte att installera uppdateringarna"
+msgstr "Det gick inte att installera uppgraderingarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
-"Uppdateringen avbryts nu. Ditt system kan vara i ett oanvändbart läge. En "
-"återställning körs nu (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr "Det gick inte ladda ner uppdateringarna"
+msgstr "Det gick inte ladda ner uppgraderingarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -234,23 +288,23 @@ msgstr ""
 "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller "
 "ditt installationsmedia och försök igen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "Ta bort föråldrade paket?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "_Hoppa över det här steget"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "Fel inträffade vid utförandet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -260,21 +314,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Kontrollerar pakethanterare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Uppdaterar förrådsinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
+#: ../DistUpgrade/DistUpgradeControler.py:399
 #, fuzzy
-msgid "Inavlid package information"
+msgid "Invalid package information"
 msgstr "Paketinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -282,44 +336,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Ber om bekräftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
-msgstr "Uppdaterar"
+msgstr "Uppgraderar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Söker efter föråldrad mjukvara"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Systemuppdateringen är klar."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Mata in \"%s\" i enheten \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Hämtningen är färdig"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Hämtar hem fil %li av %li i %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s återstår"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "Laddar ner fil %li av %li"
@@ -327,21 +381,21 @@ msgstr "Laddar ner fil %li av %li"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
-msgstr "Genomför ändringar"
+msgstr "Verställer ändringar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Kunde inte installera \"%s\""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Uppdateringen avbryts nu. Var vänlig rapportera detta som en bugg."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -350,83 +404,80 @@ msgstr ""
 "Ersätt konfigurationsfil\n"
 "\"%s\"?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "Kommandot \"diff\" hittades inte"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Ett kritiskt fel uppstod"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
-"Var vänlig rapportera detta som en bugg och inkludera filerna ~/dist-upgrade."
-"log och ~/dist-upgrade-apt.log i din rapport. Uppdateringen avbryts nu. "
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s paket kommer att tas bort."
 msgstr[1] "%s paket kommer att tas bort."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s nytt paket kommer att installeras."
 msgstr[1] "%s nya paket kommer att installeras."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s paket kommer att uppgraderas."
 msgstr[1] "%s paket kommer att uppgraderas."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Du behöver ladda ner totalt %s."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
-msgstr "För att förhindra dataförlust stäng alla öppna program och dokument."
+msgstr "Stäng alla öppna program och dokument för att undvika dataförlust."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr "Kunde inte hitta några uppdateringar"
+msgstr "Kunde inte hitta några uppgraderingar"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
-msgstr "Ditt system har redan uppdaterats."
+msgstr "Ditt system har redan uppgraderats."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Ta bort %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "Installera %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr "Uppdatera %s"
+msgstr "Uppgradera %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
@@ -436,7 +487,7 @@ msgstr "Omstart krävs"
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"Uppdateringen är klar och datorn behöver startas om. Vill du göra det nu?"
+"Uppgraderingen är klar och datorn behöver startas om. Vill du göra det nu?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -456,17 +507,17 @@ msgid ""
 msgstr ""
 "<b><big>Avbryt pågående uppdatering?</big></b>\n"
 "\n"
-"Systemet kan hamna i ett oanvändbart läge om du avbryter uppdateringen. Du "
-"är starkt rekommderad att fortsätta uppdateringen."
+"Systemet kan hamna i ett oanvändbart läge om du avbryter uppgraderingen. Du "
+"är starkt rekommderad att fortsätta uppgraderingen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
-"<b><big>Starta om systemet för att färdigställa uppdateringen</big></b>"
+"<b><big>Starta om systemet för att färdigställa uppgraderingen</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Starta uppdateringen?</big></b>"
+msgstr "<b><big>Starta uppgraderingen?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
@@ -490,19 +541,19 @@ msgstr "Skillnad mellan filerna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr "Hämtar och installerar uppdateringarna"
+msgstr "Hämtar och installerar uppgraderingarna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Ändra förråden för program"
+msgstr "Ändrar källorna för program"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "Förbereder uppdateringen"
+msgstr "Förbereder uppgraderingen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr "Startar om systemet"
+msgstr "Startar om datorn"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
@@ -510,7 +561,7 @@ msgstr "Terminalfönster"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr "Uppdaterar Ubuntu"
+msgstr "Uppgraderar Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
@@ -530,125 +581,126 @@ msgstr "_Starta om nu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr "_Återuppta uppdateringen"
+msgstr "_Återuppta uppgraderingen"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Kunde inte hitta några uppdateringar"
+msgstr "Det gick inte att hitta utgåvenoteringarna"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Servern kan vara överbelastad. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Det gick inte ladda ner uppdateringarna"
+msgstr "Det gick inte att ladda ner utgåvenoteringarna"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Kontrollera din internetanslutning"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Det gick inte att installera uppdateringarna"
+msgstr "Det gick inte att köra uppdateringsverktyget"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Ett problem som inte gick att lösa uppstod när uppdateringen beräknades. Var "
-"vänlig rapportera detta som en bugg. "
+"Det är troligast en bugg i uppdateringsverktyget. Var god rapportera det som "
+"en bugg."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Hämtar och installerar uppdateringarna"
+msgstr "Hämtar uppdateringsverktyget"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
+"Uppdateringsverktyget kommer att guida dig genom uppdateringsprocessen."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Uppdateringsverktygets signatur"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Uppdatera %s"
+msgstr "Uppdateringsverktyg"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Misslyckades med att hämta"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
+"Hämtningen av uppdateringen misslyckades. Det kan vara ett problem med "
+"nätverket. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "Misslyckades med att packa upp"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Uppackningen av uppdateringen misslyckades. Det kan vara ett problem med "
+"nätverket eller servern. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
-#, fuzzy
 msgid "Verfication failed"
-msgstr "Transaktion misslyckades"
+msgstr "Kontrollen misslyckades"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
 msgstr ""
+"Kontrollen av uppdateringen misslyckades. Det kan vara ett problem med "
+"nätverket eller servern. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autentisering"
+msgstr "Autentisering misslyckades"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Autentisering av uppdateringen misslyckades. Det kan vara ett problem med "
+"nätverket eller servern. "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
 msgstr "Hämtar hem fil %li av %li i %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "Hämtar hem fil %li av %li med en okänd hastighet"
+msgstr "Hämtar hem fil %li av %li med okänd hastighet"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
-"Misslyckades med att hämta ändringar. Kontrollera att det finns en aktiv "
-"Internetanslutning."
+"Misslyckades med att hämta listan med ändringar. Kontrollera din "
+"internetanslutning."
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "Visa och installera tillgängliga uppdateringar"
+msgstr "Det går inte att installera alla tillgängliga uppdateringar"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -656,105 +708,98 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"Vissa uppdateringar kräver att andra program avinstalleras. Använd "
+"funktionen \"Markera alla Uppgraderingar\" i packethanteraren Synaptic eller "
+"kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera ditt "
+"system helt och hållet."
 
 #: ../UpdateManager/UpdateManager.py:195
-#, fuzzy
 msgid "The following updates will be skipped:"
-msgstr "Följande kanaler är våra kanaltips! "
+msgstr "Följande uppdateringar kommer att hoppas över"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "Hämtar spegellista..."
+msgstr "Hämtar lista med ändringar..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Hämtar %s..."
+msgstr "Nerladdningsstorlek: %s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "Ditt system är aktuellt!"
+msgstr "Ditt system är uppdaterat"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Visa och installera tillgängliga uppdateringar"
-msgstr[1] "Visa och installera tillgängliga uppdateringar"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "Visa detaljer"
+msgstr "Dölj detaljer"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "Visa detaljer"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Var god vänta, det här kan ta lite tid"
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "Hämtningen är färdig"
-
-#: ../UpdateManager/UpdateManager.py:586
-#, fuzzy
-msgid "Repositories changed"
-msgstr "Värdnamnet har ändrats"
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
+msgstr "Uppdateringen är färdig"
 
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "Ny version: %s"
+msgstr "Ny version: %s (Storlek: %s)"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribution stöds inte längre"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"Du kommer inte längre få säkerhets- eller kritiska uppdateringar. Uppgradera "
+"till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer "
+"information angånde uppgradering."
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "Bara ett programhanteringsverktyg kan köras åt gången"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-msgstr ""
+msgstr "Stäng det andra programmet först, t.ex. 'aptitude' eller 'Synaptic'"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "Indexet för program är trasigt"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"Det är inte möjligt att installera eller ta bort några program. Använd "
+"packethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en "
+"terminal för att rätta till det här problemet först."
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -763,23 +808,19 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
-"<b><big>Du måste kolla efter uppdateringar manuellt</big></b>\n"
+"<b><big>Du måste titta efter uppdateringar manuellt</big></b>\n"
 "\n"
-"Ditt system kollar inte efter uppdateringar automatiskt. Du kan konfiguera "
+"Ditt system tittar inte efter uppdateringar automatiskt. Du kan konfiguera "
 "detta beteende i \"System\" -> \"Administration\" -> "
 "\"Programvaruinställningar\""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"<big><b>Analyserar ditt system</b></big>\n"
-"\n"
-"Programvaruuppdateringar kan åtgärda fel, eliminera säkerhetshål och "
-"tillhandahålla nya funktioner för dig."
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
@@ -819,11 +860,9 @@ msgstr "Programvaruuppdateringar"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
-"Programvaruuppdateringar kan åtgärda fel, eliminera säkerhetshål och "
-"tillhandahålla nya funktioner för dig."
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
@@ -884,12 +923,8 @@ msgstr "Internetuppdateringar"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
-"Endast säkerhetsuppdateringar från de officiella Ubuntu-servrarna kommer att "
-"installeras automatiskt. Programpaketet \"unattended-upgrades\" behöver "
-"därför installeras"
 
 #: ../data/SoftwareProperties.glade.h:11
 msgid "Restore _Defaults"
@@ -931,7 +966,7 @@ msgstr ""
 "<b><big>Kanalinformationen är gammal</big></b>\n"
 "\n"
 "Du behöver uppdatera kanalinformationen för att installera program och "
-"uppdateringar från nya tillagda eller ändrade kanaler. \n"
+"uppdateringar från nya eller ändrade kanaler. \n"
 "\n"
 "Du behöver en fungerande internetanslutning för att kunna fortsätta."
 
@@ -948,9 +983,8 @@ msgid "<b>Components:</b>"
 msgstr "<b>Komponenter:</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
-msgstr "<b>Komponenter:</b>"
+msgstr "<b>Komponenter</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
@@ -969,14 +1003,9 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>Skriv in den kompletta APT-raden för kanalen du vill lägga till</b></"
-"big>\n"
-"\n"
-"APT-raden innehåller typ, plats och avdelningar för kanalen, till exempel <i>"
-"\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
@@ -1028,10 +1057,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Kontrollera automatiskt om en nyare version av nuvarande distribution finns "
+"tillgänglig och fråga om du vill uppdatera (om möjligt)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Sök efter ny utgåva av distributionen"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1049,7 +1080,7 @@ msgstr "Påminn om att uppdatera kanallistan"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr "Visa detaljer om en uppdatering"
+msgstr "Visa detaljer för en uppdatering"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
@@ -1068,9 +1099,8 @@ msgid "The window size"
 msgstr "Fönsterstorleken"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "Kontrollera programvarukanalerna efter nya uppdateringar"
+msgstr "Konfigurera programkanaler och internetuppdateringar"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1100,7 +1130,7 @@ msgstr "Ubuntu 6.06 Uppdateringar"
 #. Description
 #: ../channels/Ubuntu.info.in:57
 msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 6.06 Bakåtportningar"
+msgstr "Ubuntu 6.06 Bakåtportar"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
@@ -1120,7 +1150,7 @@ msgstr "Ubuntu 5.10 Uppdateringar"
 #. Description
 #: ../channels/Ubuntu.info.in:125
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Bakåtportningar"
+msgstr "Ubuntu 5.10 Bakåtportar"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
@@ -1188,9 +1218,89 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden"
 msgid "Non-DFSG-compatible Software"
 msgstr "Inte DFSG-kompatibel programvara"
 
+#~ msgid "No valid entry found"
+#~ msgstr "Ingen giltig källa funnen"
+
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr ""
+#~ "Ingen giltig källa för uppdatering hittades när din förrådsinformation "
+#~ "söktes igenom.\n"
+
+#~ msgid ""
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery is now run (dpkg --configure -a)."
+#~ msgstr ""
+#~ "Uppdateringen avbryts nu. Ditt system kan vara i ett oanvändbart läge. En "
+#~ "återställning körs nu (dpkg --configure -a)."
+
+#~ msgid ""
+#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
+#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
+#~ msgstr ""
+#~ "Var vänlig rapportera detta som en bugg och inkludera filerna ~/dist-"
+#~ "upgrade.log och ~/dist-upgrade-apt.log i din rapport. Uppdateringen "
+#~ "avbryts nu. "
+
+#~ msgid "You can install one update"
+#~ msgid_plural "You can install %s updates"
+#~ msgstr[0] "Du kan installera en uppdatering"
+#~ msgstr[1] "Du kan installera %s uppdateringar"
+
+#~ msgid "Repositories changed"
+#~ msgstr "Förråd ändrade"
+
+#~ msgid ""
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr ""
+#~ "Du behöver uppdatera paketlistan från servrarna för att dina förändringar "
+#~ "ska börja gälla. Vill du göra det nu?"
+
+#~ msgid ""
+#~ "<big><b>Analysing your system</b></big>\n"
+#~ "\n"
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ msgstr ""
+#~ "<big><b>Analyserar ditt system</b></big>\n"
+#~ "\n"
+#~ "Programvaruuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge "
+#~ "dig nya funktioner."
+
+#~ msgid ""
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ msgstr ""
+#~ "Programuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge dina "
+#~ "program nya funktioner."
+
+#~ msgid ""
+#~ "Only security updates from the official Ubuntu servers will be installed "
+#~ "automatically. The software package \"unattended-upgrades\" needs to be "
+#~ "installed therefor"
+#~ msgstr ""
+#~ "Endast säkerhetsuppdateringar från de officiella Ubuntu-servrarna kommer "
+#~ "att installeras automatiskt. Programpaketet \"unattended-upgrades\" "
+#~ "behöver därför installeras"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>Avdelningar:</b>"
 
+#~ msgid ""
+#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
+#~ "b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and sections of a channel, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+#~ msgstr ""
+#~ "<big><b>Skriv in den kompletta APT-raden för kanalen du vill lägga till</"
+#~ "b></big>\n"
+#~ "\n"
+#~ "APT-raden innehåller typ, plats och avdelningar för kanalen, till exempel "
+#~ "<i>\"deb http://ftp.debian.org sarge main\"</i>."
+
 #~ msgid "Oficially supported"
 #~ msgstr "Stöds officiellt"
 
diff --git a/po/uk.po b/po/uk.po
index 64a3d5bd..54d492f6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:25+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:32+0000\n"
 "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,41 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Подробиці</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "Кожні %s днів"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "Кожні %s днів"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -135,42 +165,74 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Зчитування кешу"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+#, fuzzy
+msgid "No valid mirror found"
 msgstr "Не знайдено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "Помилка в даних про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Помилка підчас поновлення"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "Недостатньо місця на диску"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -178,15 +240,15 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "Бажаєте почати апгрейд системи?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "Неможливо провести апргрейд системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
@@ -196,11 +258,11 @@ msgstr ""
 "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою "
 "Synaptic для налаштування системи."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "Неможливо завантажити пакунки для апргрейду системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -208,24 +270,24 @@ msgstr ""
 "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з "
 "інтернетом чи носії та спробуйте знов. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 #, fuzzy
 msgid "Remove obsolete packages?"
 msgstr "Видалити непотрібні пакунки?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -235,20 +297,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "Перевірка програми управління пакунками"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "Отримання інформації про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -256,45 +318,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "Запит підтвердження"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Оновлення завершено"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "Пошук програм, що не використовуються"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "Апргрейд системи завершено."
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Вставте '%s' в пристрій '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "Завантадення пакунків завершено"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "Завантажується файл %li of %li at %s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "%s залишилось"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -302,38 +364,38 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Завантаження змін..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Не можливо встановити '%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "Виникла невиправна помилка"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -341,9 +403,9 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-"
-"upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано. "
+"upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
@@ -351,7 +413,7 @@ msgstr[0] "%s пакунків буде видалено."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
@@ -359,7 +421,7 @@ msgstr[0] "%s пакунків буде встановлено."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
@@ -367,42 +429,42 @@ msgstr[0] "буде проведено апргрейд %s пакунків."
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "Потрібно завантажити всього %s пакунків."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом "
 "всього часу."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "Не знайдено пакунків для апгрейду"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "Апгрейд вашої системи вже проведено."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>Видалити %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, fuzzy, python-format
 msgid "Install %s"
 msgstr "Встановити %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, fuzzy, python-format
 msgid "Upgrade %s"
 msgstr "Апргрейд %s"
@@ -536,7 +598,7 @@ msgstr "Неможливо провести апргрейд системи"
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
+msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -612,7 +674,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
 
@@ -633,94 +696,84 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версія %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Завантаження змін"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Завантаження змін"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Ваша система оновлена!"
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, fuzzy, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Неможливо провести апргрейд системи"
 msgstr[1] "Неможливо провести апргрейд системи"
 msgstr[2] "Неможливо провести апргрейд системи"
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Подробиці</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 #, fuzzy
 msgid "Update is complete"
 msgstr "Завантадення пакунків завершено"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Ваш дистрибутив вже не підтримується"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -737,10 +790,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -781,8 +834,8 @@ msgstr "Оновлення програм"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -849,8 +902,7 @@ msgstr "<b>Оновлення через Інтернет</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -931,7 +983,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></"
diff --git a/po/update-manager.pot b/po/update-manager.pot
index a06660d6..aca1589d 100644
--- a/po/update-manager.pot
+++ b/po/update-manager.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -133,41 +161,72 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -175,47 +234,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,20 +282,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -244,44 +303,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -289,97 +348,97 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -576,7 +635,8 @@ msgstr ""
 
 #: ../UpdateManager/UpdateManager.py:153
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 
 #. print "WARNING, keeping packages"
@@ -595,88 +655,78 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:440
+#: ../UpdateManager/UpdateManager.py:443
 #, python-format
-msgid "You can install one update"
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -693,10 +743,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -737,8 +787,8 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -800,8 +850,7 @@ msgstr ""
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -875,7 +924,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 38458000..a0a80330 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager Gnome HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:25+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:32+0000\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.2.2\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>Chi tiết</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -134,42 +163,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "Gặp lỗi khi gỡ bỏ khóa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -177,47 +237,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -225,21 +285,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Một bộ quản lý gói khác đang chạy"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -247,45 +307,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "Nâng cấp xong"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -293,96 +353,96 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "Đang tài về các thay đổi..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -510,7 +570,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. "
+msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -585,7 +645,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động "
 "chưa."
@@ -607,91 +668,81 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "Phiên bản %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "Đang tải các thay đổi"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "Đang tải các thay đổi"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Hệ thống bạn toàn mới nhất."
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Đang cài đặt bản cập nhật..."
+msgstr[0] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>Chi tiết</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Không còn hỗ trợ lại bản phát hành của bạn."
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -708,10 +759,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -752,8 +803,8 @@ msgstr "Bản cập nhật phần mềm"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -820,8 +871,7 @@ msgstr "<b>Cập nhật dùng Mạng</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -902,7 +952,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>Hãy nhập toàn dòng APT của kho cần thêm</b></big>\n"
@@ -1273,7 +1323,6 @@ msgstr ""
 #~ msgstr "Phải là người chủ để chạy chương trình này."
 
 # #-#-#-#-#  compendium3.po (alleyoop HEAD)  #-#-#-#-#
-# #-#-#-#-#  vi.po (Gnome-icon-theme)  #-#-#-#-#
 #~ msgid "Binary"
 #~ msgstr "Nhị phân"
 
diff --git a/po/xh.po b/po/xh.po
index 7f64c812..2469bc7f 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:25+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-20 19:15+0000\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -133,41 +161,72 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -175,47 +234,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -223,20 +282,20 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -244,44 +303,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -289,97 +348,97 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr ""
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -576,7 +635,8 @@ msgstr ""
 
 #: ../UpdateManager/UpdateManager.py:153
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr ""
 
 #. print "WARNING, keeping packages"
@@ -595,88 +655,78 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Seka zonke izihlaziyo"
-msgstr[1] "Seka zonke izihlaziyo"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -693,10 +743,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -738,8 +788,8 @@ msgstr "Bonisa izihlaziyo"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -805,8 +855,7 @@ msgstr "Bonisa izihlaziyo"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -885,7 +934,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d5a83048..f80d3f0d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-08 11:35+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:32+0000\n"
 "Last-Translator: stone_unix <gaoghy@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "详细信息"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+#, fuzzy
+msgid "Every two days"
+msgstr "每%s天"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr "每%s天"
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -142,41 +172,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr "正在读取缓存"
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+#, fuzzy
+msgid "No valid mirror found"
 msgstr "未找到有效记录"
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
-msgstr "在检查你的源的信息时未能找到有效的升级记录\n"
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
+msgid ""
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr "源的信息无效"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
 msgstr "升级时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr "磁盘空间不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -186,15 +248,15 @@ msgstr ""
 "升级已被取消。请清理出至少%s的磁盘空间。清空你的回收站并通过'sudo apt-get "
 "clean'命令来删除之前安装的临时软件包。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr "你要开始升级么？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr "无法安装升级"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
@@ -203,33 +265,33 @@ msgstr ""
 "升级现在取消。你的系统可能处于不稳定状态。恢复工作在运行中(dpkg --configure -"
 "a)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr "无法下载升级包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr "删除陈旧的软件包？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr "跳过这个步骤(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr "确认时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -237,20 +299,20 @@ msgstr "在清理时发生问题。更多信息请查看以下消息。 "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
 msgstr "正在检查软件包管理器"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr "更新源的信息"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -258,44 +320,44 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr "请求确认"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
 msgstr "正在更新"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr "寻找陈旧的软件包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr "系统更新完毕"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "请将'%s'插入光驱'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr "下载完成"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr "正在下载文件%li来自%li速度是%s/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr "还剩%s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr "正在下载第 %li 个文件(共 %li 个文件)"
@@ -303,21 +365,21 @@ msgstr "正在下载第 %li 个文件(共 %li 个文件)"
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
 msgstr "正在应用更新"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr "无法安装'%s'"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "升级被取消。请报告这个bug。"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
@@ -326,15 +388,15 @@ msgstr ""
 "替换配置文件\n"
 "“%s”吗？"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr "外部命令“diff”没有找到"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr "出现致命错误"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 #, fuzzy
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
@@ -342,60 +404,60 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "请报告这个bug并在你的报告中包括这些文件~/dist-upgrade.log和~/dist-upgrade-"
-"apt.log。升级现在取消。 "
+"apt.log。升级现在取消。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] "%s软件包将被删除。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] "%s新的软件包将被安装。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] "%s软件包将被升级"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr "你下载了总体的%s。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr "升级会持续几个小时且不能在此后的任何时候被终止"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr "关闭所有打开的程序和文档以防止数据丢失。"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr "不能找到任何升级"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr "你的系统已经升级。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr "<b>删除%s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr "安装%s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr "升级%s"
@@ -500,116 +562,110 @@ msgid "_Resume Upgrade"
 msgstr "继续升级(_R)"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "不能找到任何升级"
+msgstr "无法找到升级注记"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "服务器可能已超负荷。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "无法下载升级包"
+msgstr "无法下载升级注记"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "请检查你的互联网连接。"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "无法安装升级"
+msgstr "不能运行升级工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 "
+msgstr "这很可能是升级工具的一个bug。请汇报这个bug。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "下载并安装升级"
+msgstr "下载升级工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "升级工具将引导你完成升级过程。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "升级工具签名"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "升级%s"
+msgstr "升级工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "获取失败"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "获取升级信息失败。可能网络有问题。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "提取失败"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "提取升级信息失败。可能是网络或服务器的问题。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "验证失败"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
-msgstr ""
+msgstr "验证升级程序失败。可能是网络或服务器的问题。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "身份验证(_U)"
+msgstr "认证失败"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
-msgstr ""
+msgstr "认证升级信息失败。可能是网络或服务器的问题。 "
 
 #: ../UpdateManager/GtkProgress.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr "正在下载文件%li来自%li速度是%s/s"
+msgstr "正在下载文件 %li 来自 %li 速度是 %s/s"
 
 #: ../UpdateManager/GtkProgress.py:111
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr "正在下载文件%li来自%li速度未知"
+msgstr "正在下载文件 %li 来自 %li 速度未知"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "变动列表尚不可用。请稍后再试。"
 
 #: ../UpdateManager/UpdateManager.py:153
+#, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
-msgstr ""
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr "无法下载更新列表。请检查您的网络连接。"
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "显示并安装可用更新"
+msgstr "无法安装所有升级"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -617,102 +673,95 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并运"
+"行 “sudo apt-get dist-upgrade”来彻底更你新的系统。"
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "将跳过以下的升级包"
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "正在下载第 %li 个文件(共 %li 个文件)"
+msgstr "正在下载更新列表..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "下载文件大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "您的系统已为最新！"
+msgstr "您的系统已为最新"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "显示并安装可用更新"
+msgstr[0] ""
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "显示详情"
+msgstr "隐藏详情"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr "显示详情"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "请稍等，这需要花一些时间。"
 
-#: ../UpdateManager/UpdateManager.py:472
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr "下载完成"
+msgstr "更新完成"
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr "仓库已变更"
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:580
+#, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr "新版本：%s"
+msgstr "新版本：%s(大小：%s)"
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "您的发行版不再被支持"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"你将不再获得更多的安全修订或重要更新。升级到更高版本的 Ubuntu Linux。请参见"
+"\r\n"
+"http://www.ubuntu.com 来获取更多有关升级的信息。"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "同时只能有一个软件管理工具在运行"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-msgstr ""
+msgstr "请先关闭别的应用程序，如“aptitude”或“synaptic”。"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "软件索引已被破坏"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"无法安装或删除任何软件。请使用包管理软件\"synaptic\"或在终端运行\"sudo apt-"
+"get install -f\"来修正这个问题。"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -727,11 +776,12 @@ msgstr ""
 "变."
 
 #: ../data/UpdateManager.glade.h:4
+#, fuzzy
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 "<big><b>正在检查有效的更新</b></big>\n"
 "\n"
@@ -774,9 +824,10 @@ msgid "Software Updates"
 msgstr "软件更新"
 
 #: ../data/UpdateManager.glade.h:17
+#, fuzzy
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性"
 
 #: ../data/UpdateManager.glade.h:18
@@ -836,10 +887,10 @@ msgid "Internet Updates"
 msgstr "<b>Internet 更新</b>"
 
 #: ../data/SoftwareProperties.glade.h:10
+#, fuzzy
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 "只有来自官方Ubuntu服务器的安全更新才会被自动安装。为此，名为\"unattended-"
 "upgrades\"软件包需要被安装。"
@@ -915,11 +966,12 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
+#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>输入你想增加的完整的频道 APT 命令行</b></big>\n"
@@ -974,11 +1026,11 @@ msgstr "更新管理器"
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
-msgstr ""
+msgstr "自动检测是否有当前发行版的新版本可用并建议升级（可能的话）。"
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "检测新版本发布"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1012,9 +1064,8 @@ msgid "The window size"
 msgstr "窗口大小"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure software channels and internet updates"
-msgstr "检查软件频道以获得新的更新"
+msgstr "设定软件频道和互联网升级"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1132,6 +1183,14 @@ msgstr "带有非自由依赖关系的DFSG兼容软件"
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
+#~ msgid ""
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr "在检查你的源的信息时未能找到有效的升级记录\n"
+
+#~ msgid "Repositories changed"
+#~ msgstr "仓库已变更"
+
 #~ msgid "<b>Sections</b>"
 #~ msgstr "<b>节：</b>"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0bf1a987..cd38293f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:25+0000\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-04-28 23:33+0000\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+#, fuzzy
+msgid "Daily"
+msgstr "<b>細節</b>"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr ""
+
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
@@ -133,42 +162,73 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
+msgstr ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 #, fuzzy
 msgid "Error during update"
 msgstr "移除密碼匙時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 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:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
@@ -176,47 +236,47 @@ msgid ""
 "get clean'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -224,21 +284,21 @@ msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 #, fuzzy
 msgid "Checking package manager"
 msgstr "另一個套件管理員正在執行中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
+#: ../DistUpgrade/DistUpgradeControler.py:399
+msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -246,45 +306,45 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
+#: ../DistUpgrade/DistUpgradeControler.py:414
 #, fuzzy
 msgid "Upgrading"
 msgstr "完成升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
 msgstr ""
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
 msgstr ""
@@ -292,99 +352,99 @@ 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:140
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 #, fuzzy
 msgid "Applying changes"
 msgstr "正在下載更改紀錄..."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 #, fuzzy
 msgid "The upgrade aborts now. Please report this bug."
 msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
 msgstr ""
@@ -512,7 +572,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "你選定的密碼匙無法移除，請匯報問題。 "
+msgstr "你選定的密碼匙無法移除，請匯報問題。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 #, fuzzy
@@ -587,7 +647,8 @@ msgstr ""
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
 
 #. print "WARNING, keeping packages"
@@ -607,92 +668,82 @@ msgstr ""
 msgid "The following updates will be skipped:"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:390
 #, fuzzy
 msgid "Downloading the list of changes..."
 msgstr "正在下載更改紀錄"
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "正在下載更改紀錄"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:431
+#: ../UpdateManager/UpdateManager.py:432
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "系統已經在最新狀態！"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "正在安裝軟件更新..."
-msgstr[1] "正在安裝軟件更新..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:458
 #, fuzzy
 msgid "Hide details"
 msgstr "<b>細節</b>"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:634
+#: ../UpdateManager/UpdateManager.py:594
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "已經不再支援你用的發行版本"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -709,10 +760,10 @@ msgstr ""
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
@@ -753,8 +804,8 @@ msgstr "軟件更新"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
@@ -821,8 +872,7 @@ msgstr "<b>線上更新</b>"
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
+"automatically"
 msgstr ""
 
 #: ../data/SoftwareProperties.glade.h:11
@@ -903,7 +953,7 @@ msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
 "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 07dd16f5..77c84e7d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4 +1,4 @@
-# traditional Chinese translation of update-manager.
+# Chinese (Taiwan)translation of update-manager.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Abel Cheung <abel@oaka.org>, 2005.
 #
@@ -6,28 +6,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-04-27 18:14+0200\n"
-"PO-Revision-Date: 2006-04-04 20:25+0000\n"
-"Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"POT-Creation-Date: 2006-05-08 15:08+0200\n"
+"PO-Revision-Date: 2006-05-01 19:01+0000\n"
+"Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../SoftwareProperties/SoftwareProperties.py:103
+msgid "Daily"
+msgstr "每天"
+
+#: ../SoftwareProperties/SoftwareProperties.py:104
+msgid "Every two days"
+msgstr "每兩天"
+
+#: ../SoftwareProperties/SoftwareProperties.py:105
+msgid "Weekly"
+msgstr "每周"
+
+#: ../SoftwareProperties/SoftwareProperties.py:106
+msgid "Every two weeks"
+msgstr "每隔兩周"
+
 #: ../SoftwareProperties/SoftwareProperties.py:111
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "每隔 %s 天"
+
+#: ../SoftwareProperties/SoftwareProperties.py:134
+msgid "After one week"
+msgstr "每隔一週"
+
+#: ../SoftwareProperties/SoftwareProperties.py:135
+msgid "After two weeks"
+msgstr "兩週後"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "After one month"
+msgstr "一個月後"
 
 #: ../SoftwareProperties/SoftwareProperties.py:141
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "%s 天過後"
 
 #: ../SoftwareProperties/SoftwareProperties.py:422
 msgid "Import key"
-msgstr ""
+msgstr "匯入金鑰"
 
 #: ../SoftwareProperties/SoftwareProperties.py:432
 msgid "Error importing selected file"
@@ -52,49 +80,53 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<big><b>掃描光碟時發生錯誤</b></big>\n"
+"\n"
+"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:544
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "請輸入光碟的名稱"
 
 #: ../SoftwareProperties/SoftwareProperties.py:560
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "請將光碟放入光碟機："
 
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
-msgstr ""
+msgstr "不完整套件"
 
 #: ../DistUpgrade/DistUpgradeCache.py:93
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
 msgstr ""
+"您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 "
+"synaptic 或 apt-get 來修恢它們。"
 
 #: ../DistUpgrade/DistUpgradeCache.py:135
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "無法升級須要的元套件 (meta-package)"
 
 #: ../DistUpgrade/DistUpgradeCache.py:142
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "將會移除的核心套件"
 
 #. FIXME: change the text to something more useful
 #: ../DistUpgrade/DistUpgradeCache.py:145
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "無法計算升級"
 
 #: ../DistUpgrade/DistUpgradeCache.py:146
-#, fuzzy
 msgid ""
 "A unresolvable problem occured while calculating the upgrade. Please report "
 "this as a bug. "
-msgstr "您選定的金鑰無法移除，請匯報問題。 "
+msgstr "計算升級時發生無法解決的問題，請匯報問題。 "
 
 #. FIXME: maybe ask a question here? instead of failing?
 #: ../DistUpgrade/DistUpgradeCache.py:169
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "認證一些套件時發生錯誤"
 
 #: ../DistUpgrade/DistUpgradeCache.py:170
 msgid ""
@@ -102,23 +134,24 @@ msgid ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 msgstr ""
+"一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證"
+"的套件。"
 
 #: ../DistUpgrade/DistUpgradeCache.py:233
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "無法安裝‘%s’"
 
 #: ../DistUpgrade/DistUpgradeCache.py:234
-#, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "您選定的金鑰無法移除，請匯報問題。 "
+msgstr "無法安裝須要的套件，請匯報問題。 "
 
 #. FIXME: provide a list
 #: ../DistUpgrade/DistUpgradeCache.py:241
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "無法估計元套件 (meta-package)"
 
 #: ../DistUpgrade/DistUpgradeCache.py:242
 msgid ""
@@ -128,117 +161,152 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"您的系統沒有安裝 ubuntu-desktop，kubuntu-desktop 或 edubuntu-desktop 套件，因"
+"此無法偵測正在執行那個版本的 ubuntu。\n"
+" 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件"
 
 #: ../DistUpgrade/DistUpgradeControler.py:42
 msgid "Reading cache"
+msgstr "正在讀取快取"
+
+#: ../DistUpgrade/DistUpgradeControler.py:126
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:127
+#, python-format
+msgid ""
+"While scaning your repository information no mirror entry for the upgrade "
+"was found.This cam happen if you run a internal mirror or if the mirror "
+"information is out of date.\n"
+"\n"
+"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' "
+"here it will update all '%s' to '%s' entries.\n"
+"If you select 'no' the update will cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:119
-msgid "No valid entry found"
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:144
+msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:120
+#: ../DistUpgrade/DistUpgradeControler.py:145
+#, python-format
 msgid ""
-"While scaning your repository information no valid entry for the upgrade was "
-"found.\n"
+"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
+"\n"
+"Should default entries for '%s' be added? If you select 'No' the update will "
+"cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:138
+#: ../DistUpgrade/DistUpgradeControler.py:179
 msgid "Repository information invalid"
-msgstr ""
+msgstr "無效的套件庫資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:139
+#: ../DistUpgrade/DistUpgradeControler.py:180
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
+msgstr "升級套件庫時導致無效的檔案。請匯報問題。"
+
+#: ../DistUpgrade/DistUpgradeControler.py:186
+msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:184
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:187
+msgid ""
+"Some third party entries in your souces.list where disabled. You can re-"
+"enable them after the upgrade with the 'software-properties' tool or with "
+"synaptic."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:233
 msgid "Error during update"
-msgstr "移除金鑰時發生錯誤"
+msgstr "更新時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:185
+#: ../DistUpgrade/DistUpgradeControler.py:234
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
-msgstr ""
+msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線及再試。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:204
+#: ../DistUpgrade/DistUpgradeControler.py:253
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "磁碟空間不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:205
+#: ../DistUpgrade/DistUpgradeControler.py:254
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space. Empty your "
 "trash and remove temporary packages of former installations using 'sudo apt-"
 "get clean'."
 msgstr ""
+"升級現在中止。請最少騰空 %s 磁碟空間。清理回收筒及以‘sudo apt-get clean’移除"
+"先前安裝時的暫存套件。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:211
+#: ../DistUpgrade/DistUpgradeControler.py:260
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "是否要開始升級？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:228
+#: ../DistUpgrade/DistUpgradeControler.py:277
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "無法安裝升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:278
 msgid ""
 "The upgrade aborts now. Your system can be in an unusable state. A recovery "
 "was run (dpkg --configure -a)."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:293
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "無法下載升級套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:294
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
-msgstr ""
+msgstr "升級現正中止。請檢查網路連線是否正常及再試 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:287
+#: ../DistUpgrade/DistUpgradeControler.py:336
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "移除不再使用的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Skip This Step"
-msgstr ""
+msgstr "略過這步驟(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:337
 msgid "_Remove"
-msgstr ""
+msgstr "移除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:347
 msgid "Error during commit"
-msgstr ""
+msgstr "提交時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:299
+#: ../DistUpgrade/DistUpgradeControler.py:348
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
-msgstr ""
+msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:315
-#: ../DistUpgrade/DistUpgradeControler.py:341
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:388
 msgid "Checking package manager"
-msgstr "另一個套件管理員正在執行中"
+msgstr "正在檢查套件管理程式"
 
-#: ../DistUpgrade/DistUpgradeControler.py:333
+#: ../DistUpgrade/DistUpgradeControler.py:380
 msgid "Updating repository information"
-msgstr ""
+msgstr "正在更新套件庫資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:348
-msgid "Inavlid package information"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:399
+#, fuzzy
+msgid "Invalid package information"
+msgstr "無效的套件資訊"
 
-#: ../DistUpgrade/DistUpgradeControler.py:349
+#: ../DistUpgrade/DistUpgradeControler.py:400
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -246,157 +314,156 @@ msgid ""
 "This indicates a serious error, please report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:359
+#: ../DistUpgrade/DistUpgradeControler.py:410
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "詢問以確認"
 
-#: ../DistUpgrade/DistUpgradeControler.py:363
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:414
 msgid "Upgrading"
-msgstr "完成升級"
+msgstr "升級中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:370
+#: ../DistUpgrade/DistUpgradeControler.py:421
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "尋搜不再使用的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:375
+#: ../DistUpgrade/DistUpgradeControler.py:426
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "系統升級完成。"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:78
+#: ../DistUpgrade/DistUpgradeViewGtk.py:79
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "請將‘%s’放入光碟機‘%s’中"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:96
+#: ../DistUpgrade/DistUpgradeViewGtk.py:97
 msgid "Download is complete"
-msgstr ""
+msgstr "下載完成"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:107
+#: ../DistUpgrade/DistUpgradeViewGtk.py:108
 #, python-format
 msgid "Downloading file %li of %li at %s/s"
-msgstr ""
+msgstr "正在下載檔案 %li/%li，速度在 %s/秒"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#: ../DistUpgrade/DistUpgradeViewGtk.py:220
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewGtk.py:222
 #, python-format
 msgid "%s remaining"
-msgstr ""
+msgstr "剩餘 %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:110
+#: ../DistUpgrade/DistUpgradeViewGtk.py:111
 #, python-format
 msgid "Downloading file %li of %li"
-msgstr ""
+msgstr "正在下載檔案 %li/%li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:140
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:141
 msgid "Applying changes"
-msgstr "正在下載更改紀錄..."
+msgstr "正在套用變更"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:157
+#: ../DistUpgrade/DistUpgradeViewGtk.py:158
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "無法安裝‘%s’"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:158
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:159
 msgid "The upgrade aborts now. Please report this bug."
-msgstr "您選定的金鑰無法移除，請匯報問題。"
+msgstr "升級現正中止，請匯報問題。"
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:171
+#: ../DistUpgrade/DistUpgradeViewGtk.py:172
 #, python-format
 msgid ""
 "Replace configuration file\n"
 "'%s'?"
 msgstr ""
+"取代設定檔\n"
+"‘%s‘？"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+#: ../DistUpgrade/DistUpgradeViewGtk.py:189
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "找不到‘diff’指令"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:310
+#: ../DistUpgrade/DistUpgradeViewGtk.py:315
 msgid "A fatal error occured"
-msgstr ""
+msgstr "發生嚴重錯誤"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#: ../DistUpgrade/DistUpgradeViewGtk.py:316
 msgid ""
 "Please report this as a bug and include the files /var/log/dist-upgrade.log "
 "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:403
+#: ../DistUpgrade/DistUpgradeViewGtk.py:418
 #, python-format
 msgid "%s package is going to be removed."
 msgid_plural "%s packages are going to be removed."
-msgstr[0] ""
+msgstr[0] "%s 個套件將會移除。"
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:409
+#: ../DistUpgrade/DistUpgradeViewGtk.py:424
 #, python-format
 msgid "%s new package is going to be installed."
 msgid_plural "%s new packages are going to be installed."
-msgstr[0] ""
+msgstr[0] "%s 個新套件將會安裝。"
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:415
+#: ../DistUpgrade/DistUpgradeViewGtk.py:430
 #, python-format
 msgid "%s package is going to be upgraded."
 msgid_plural "%s packages are going to be upgraded."
-msgstr[0] ""
+msgstr[0] "%s 個套件將會升級。"
 msgstr[1] ""
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:422
+#: ../DistUpgrade/DistUpgradeViewGtk.py:437
 #, python-format
 msgid "You have to download a total of %s."
-msgstr ""
+msgstr "您總共需要下載 %s。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:426
+#: ../DistUpgrade/DistUpgradeViewGtk.py:441
 msgid ""
 "The upgrade can take several hours and cannot be canceled at any time later."
-msgstr ""
+msgstr "升級可能需要數小時及無法在稍後任何時間取消。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:429
+#: ../DistUpgrade/DistUpgradeViewGtk.py:444
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "避免遺失請關閉所有已開啟的程式及文件。"
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:435
+#: ../DistUpgrade/DistUpgradeViewGtk.py:450
 msgid "Could not find any upgrades"
-msgstr ""
+msgstr "無法找到任何升級"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:436
+#: ../DistUpgrade/DistUpgradeViewGtk.py:451
 msgid "Your system has already been upgraded."
-msgstr ""
+msgstr "系統升級已經完成。"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:451
+#: ../DistUpgrade/DistUpgradeViewGtk.py:466
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>移除 %s</b>"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:453
+#: ../DistUpgrade/DistUpgradeViewGtk.py:468
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "安裝 %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:455
+#: ../DistUpgrade/DistUpgradeViewGtk.py:470
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "升級 %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:75
 msgid "Reboot required"
-msgstr ""
+msgstr "須要重新開機"
 
 #: ../DistUpgrade/DistUpgradeView.py:76
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
-msgstr ""
+msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -414,187 +481,186 @@ msgid ""
 "The system could be in an unusable state if you cancel the upgrade. You are "
 "strongly adviced to resume the upgrade."
 msgstr ""
+"<b><big>取消正在執行的升級？</big></b>\n"
+"\n"
+"如果您取消升級可能會導致系統不穩定。強烈建議您繼續升級。"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>重新啟動系統以完成更新</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>開始升級？</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid ""
 "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</"
 "span>"
 msgstr ""
+"<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu  6.06 “Dapper”</span>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "清理"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>細節</b>"
+msgstr "詳細資料"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "檔案間的差別"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Downloading and installing the upgrades"
-msgstr ""
+msgstr "正在下載及安裝升級"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "更改軟體來源"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "正準備升級"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "重新啟動系統"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "終端"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
 msgid "Upgrading Ubuntu"
-msgstr ""
+msgstr "正在升級 Ubuntu"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
 msgid "_Keep"
-msgstr ""
+msgstr "保留(_K)"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
 msgid "_Replace"
-msgstr "重新載入"
+msgstr "取代(_R)"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Report Bug"
-msgstr ""
+msgstr "報告錯誤(_R)"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Restart Now"
-msgstr ""
+msgstr "現在重新啟動(_R)"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "繼續升級(_R)"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "無法找到發行說明"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "伺服器可能負荷過重。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "無法下載發行說明"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "請檢查您的網路連線。"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:151
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "無法執行升級工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:152
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "您選定的金鑰無法移除，請匯報問題。 "
+msgstr "這可能是升級工具的錯誤，請匯報問題"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "正在下載更改紀錄"
+msgstr "正在下載升級工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:175
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "升級工具會引導您整個升級過程。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:182
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "升級工具簽署"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:185
 msgid "Upgrade tool"
-msgstr ""
+msgstr "升級工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:207
 msgid "Failed to fetch"
-msgstr ""
+msgstr "下載失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "下載升級套件失敗。可能是網路問題。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:213
 msgid "Failed to extract"
-msgstr ""
+msgstr "解壓失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "升級套件解壓失敗。可能是因為跟伺服器的網路連線出現問題。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:220
 msgid "Verfication failed"
-msgstr ""
+msgstr "檢驗失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid ""
 "Verfing the upgrade failed.  There may be a problem with the network or with "
 "the server. "
-msgstr ""
+msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:227
-#, fuzzy
 msgid "Authentication failed"
-msgstr "認證"
+msgstr "認證失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
-msgstr ""
+msgstr "認證升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 "
 
 #: ../UpdateManager/GtkProgress.py:107
 #, python-format
 msgid "Downloading file %li of %li with %s/s"
-msgstr ""
+msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 
 #: ../UpdateManager/GtkProgress.py:111
 #, python-format
 msgid "Downloading file %li of %li with unknown speed"
-msgstr ""
+msgstr "正在下載檔案 %li/%li，下載速度不明"
 
 #: ../UpdateManager/UpdateManager.py:148
 msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+msgstr "修改紀錄不存在，請稍後再試。"
 
 #: ../UpdateManager/UpdateManager.py:153
 #, fuzzy
 msgid ""
-"Failed to download the listof changes. Please check your internet connection."
-msgstr "無法下載更改紀錄。請檢查網路連線是否正常。"
+"Failed to download the list of changes. Please check your Internet "
+"connection."
+msgstr "無法下載修改紀錄。請檢查網路連線是否正常。"
 
 #. print "WARNING, keeping packages"
 #: ../UpdateManager/UpdateManager.py:184
-#, fuzzy
 msgid "Cannot install all available updates"
-msgstr "正在檢查更新套件..."
+msgstr "無法安裝所有更新套件"
 
 #: ../UpdateManager/UpdateManager.py:185
 msgid ""
@@ -602,102 +668,94 @@ msgid ""
 "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-"
 "get dist-upgrade\" in a terminal to update your system completely."
 msgstr ""
+"有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」功能"
+"或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。"
 
 #: ../UpdateManager/UpdateManager.py:195
 msgid "The following updates will be skipped:"
-msgstr ""
+msgstr "會略過更新以下套件："
 
-#: ../UpdateManager/UpdateManager.py:329
+#: ../UpdateManager/UpdateManager.py:330
 #, python-format
 msgid "Version %s: \n"
-msgstr "版本 %s: \n"
+msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdateManager.py:389
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:390
 msgid "Downloading the list of changes..."
-msgstr "正在下載更改紀錄"
+msgstr "正在下載修改紀錄..."
 
-#: ../UpdateManager/UpdateManager.py:412 ../UpdateManager/UpdateManager.py:422
-#: ../UpdateManager/UpdateManager.py:442
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:413 ../UpdateManager/UpdateManager.py:423
+#: ../UpdateManager/UpdateManager.py:447
+#, python-format
 msgid "Download size: %s"
-msgstr "正在下載更改紀錄"
+msgstr "下載大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:431
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:432
 msgid "Your system is up-to-date"
-msgstr "系統已經在最新狀態！"
+msgstr "系統已經在最新狀態"
 
-#: ../UpdateManager/UpdateManager.py:440
-#, fuzzy, python-format
-msgid "You can install one update"
+#: ../UpdateManager/UpdateManager.py:443
+#, python-format
+msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "正在安裝軟體更新..."
-msgstr[1] "正在安裝軟體更新..."
+msgstr[0] "您可以安裝 %s 個更新"
+msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:453
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:458
 msgid "Hide details"
-msgstr "<b>細節</b>"
+msgstr "隱藏詳細資料"
 
-#: ../UpdateManager/UpdateManager.py:455 ../data/UpdateManager.glade.h:14
+#: ../UpdateManager/UpdateManager.py:460 ../data/UpdateManager.glade.h:14
 msgid "Show details"
-msgstr ""
+msgstr "顯示詳細資料"
 
-#: ../UpdateManager/UpdateManager.py:470
+#: ../UpdateManager/UpdateManager.py:475
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "請稍候，這可能需要一點時間。"
 
-#: ../UpdateManager/UpdateManager.py:472
+#: ../UpdateManager/UpdateManager.py:477
 msgid "Update is complete"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:586
-msgid "Repositories changed"
-msgstr ""
+msgstr "更新完成"
 
-#: ../UpdateManager/UpdateManager.py:587
-msgid ""
-"You need to reload the package list from the servers for your changes to "
-"take effect. Do you want to do this now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:620
+#: ../UpdateManager/UpdateManager.py:580
 #, python-format
 msgid "New version: %s   (Size: %s)"
-msgstr ""
+msgstr "新版本：%s   （大小：%s）"
 
-#: ../UpdateManager/UpdateManager.py:634
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:594
 msgid "Your distribution is not supported anymore"
-msgstr "已經不再支援您用的發行版本"
+msgstr "您正使用的發行版本已不再支援"
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:595
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 msgstr ""
+"您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 "
+"http://www.ubuntu.com以取得更多升級資訊。"
 
-#: ../UpdateManager/UpdateManager.py:686
+#: ../UpdateManager/UpdateManager.py:646
 msgid "Only one software management tool is allowed to run at the same time"
-msgstr ""
+msgstr "同時間只允許執行一個套件管理程式"
 
-#: ../UpdateManager/UpdateManager.py:688
+#: ../UpdateManager/UpdateManager.py:648
 msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-msgstr ""
+msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:705
+#: ../UpdateManager/UpdateManager.py:665
 msgid "Software index is broken"
-msgstr ""
+msgstr "軟體索引損壞"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:666
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
 "this issue at first."
 msgstr ""
+"不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執行“sudo "
+"apt-get install -f”來修正問題。"
 
 #: ../data/UpdateManager.glade.h:1
 msgid ""
@@ -706,34 +764,37 @@ msgid ""
 "Your system does not check for updates automatically. You can configure this "
 "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 msgstr ""
+"<b><big>您必須自行檢查更新</big></b>\n"
+"\n"
+"您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設定。"
 
 #: ../data/UpdateManager.glade.h:4
 msgid ""
-"<big><b>Analysing your system</b></big>\n"
+"<big><b>Examining your system</b></big>\n"
 "\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:7
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>將您的系統維持在最新狀態</b></big>"
 
 #: ../data/UpdateManager.glade.h:8
 msgid "Cancel _Download"
-msgstr ""
+msgstr "取消下載(_D)"
 
 #: ../data/UpdateManager.glade.h:9
 msgid "Changes"
-msgstr "更改紀錄"
+msgstr "修改紀錄"
 
 #: ../data/UpdateManager.glade.h:10
 msgid "Chec_k"
-msgstr ""
+msgstr "檢查(_K)"
 
 #: ../data/UpdateManager.glade.h:11
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "檢查軟體來源有沒有更新套件"
 
 #: ../data/UpdateManager.glade.h:12
 msgid "Description"
@@ -741,11 +802,11 @@ msgstr "詳細說明"
 
 #: ../data/UpdateManager.glade.h:13
 msgid "Release Notes"
-msgstr ""
+msgstr "發行說明"
 
 #: ../data/UpdateManager.glade.h:15
 msgid "Show progress of single files"
-msgstr ""
+msgstr "顯示單一檔案的進度"
 
 #: ../data/UpdateManager.glade.h:16
 msgid "Software Updates"
@@ -753,38 +814,35 @@ msgstr "軟體更新"
 
 #: ../data/UpdateManager.glade.h:17
 msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:18
 msgid "U_pgrade"
-msgstr ""
+msgstr "升級(_P)"
 
 #: ../data/UpdateManager.glade.h:19
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "升級到最新版本的 Ubuntu"
 
 #: ../data/UpdateManager.glade.h:20
 msgid "_Check"
-msgstr ""
+msgstr "檢查(_C)"
 
 #: ../data/UpdateManager.glade.h:21
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "以後不要再顯示此訊息(_H)"
 
 #: ../data/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Install Updates"
-msgstr "正在安裝軟體更新..."
+msgstr "安裝更新套件(_I)"
 
 #: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
 msgid "<b>Channels</b>"
-msgstr "<b>金鑰</b>"
+msgstr "<b>套件來源</b>"
 
 #: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>線上更新</b>"
 
@@ -794,7 +852,7 @@ msgstr "<b>金鑰</b>"
 
 #: ../data/SoftwareProperties.glade.h:4
 msgid "Add _Cdrom"
-msgstr ""
+msgstr "加入光碟(_C)"
 
 #: ../data/SoftwareProperties.glade.h:5
 msgid "Authentication"
@@ -802,55 +860,49 @@ msgstr "認證"
 
 #: ../data/SoftwareProperties.glade.h:6
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "刪除已下載的軟體檔案(_E)："
 
 #: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "由您信任的鑰匙圈中移除指定的金鑰。"
+msgstr "匯入您信任的軟體供應商的公鑰"
 
 #: ../data/SoftwareProperties.glade.h:8
 msgid "Installation Media"
 msgstr "安裝媒體"
 
 #: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>線上更新</b>"
+msgstr "線上更新"
 
 #: ../data/SoftwareProperties.glade.h:10
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
+"automatically"
+msgstr "只有來自 Ubuntu 官方伺服器的安全性更新會自動安裝"
 
 #: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "還原為預設值"
+msgstr "還原為預設值(_D)"
 
 #: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "還原為預設金鑰"
+msgstr "還原為發行版本預設的金鑰"
 
 #: ../data/SoftwareProperties.glade.h:13
 msgid "Software Preferences"
 msgstr "軟體偏好設定"
 
 #: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "檢查軟體更新間隔："
+msgstr "自動檢查更新(_C)："
 
 #: ../data/SoftwareProperties.glade.h:15
 msgid "_Download updates in the background, but do not install them"
-msgstr ""
+msgstr "在背景下載更新套件，但無須安裝(_D)"
 
 #: ../data/SoftwareProperties.glade.h:16
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "無須確認便安裝安全性更新(_I)"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:2
 msgid "     "
@@ -865,59 +917,57 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>套件來源的資料已經過期</big></b>\n"
+"\n"
+"您需要重新載入套件來源的資料以安裝軟體，及更新套件來源新加入或修改了的套"
+"件。\n"
+"\n"
+"您須要連線到網際網路繼續。"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:8
-#, fuzzy
 msgid "<b>Channel</b>"
-msgstr "<b>金鑰</b>"
+msgstr "<b>套件來源</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Comment:</b>"
-msgstr "<b>備註:</b>"
+msgstr "<b>備註：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:10
-#, fuzzy
 msgid "<b>Components:</b>"
-msgstr "<b>元件</b>"
+msgstr "<b>元件：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid "<b>Components</b>"
 msgstr "<b>元件</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:12
 msgid "<b>Distribution:</b>"
-msgstr "<b>發行版本:</b>"
+msgstr "<b>發行版本：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:13
 msgid "<b>Type:</b>"
-msgstr "<b>類型:</b>"
+msgstr "<b>類型：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:14
 msgid "<b>URI:</b>"
-msgstr "<b>URI:</b>"
+msgstr "<b>URI：</b>"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:15
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the channel that you want to add</b></"
 "big>\n"
 "\n"
-"The APT line contains the type, location and sections of a channel, for "
+"The APT line includes the type, location and components of a channel, for "
 "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 msgstr ""
-"<big><b>請輸入整行您想加入的 APT 軟體庫位置</b></big>\n"
-"\n"
-"該行的內容包括 APT 軟體庫的類型、位置和內容，例如： <i>\"deb http://ftp."
-"debian.org sarge main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:18
 msgid "APT line:"
-msgstr "APT 軟體庫:"
+msgstr "APT 套件庫位置："
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:19
 msgid "Add Channel"
-msgstr ""
+msgstr "加入套件來源"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:20
 msgid ""
@@ -929,28 +979,28 @@ msgstr ""
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:22
 msgid "Edit Channel"
-msgstr ""
+msgstr "編輯套件來源"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:23
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "正在掃描光碟"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:24
+#, fuzzy
 msgid "_Add Channel"
-msgstr ""
+msgstr "加入套件來源(_A)"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:25
 msgid "_Custom"
-msgstr "自選(_C)"
+msgstr "自訂(_C)"
 
 #: ../data/SoftwarePropertiesDialogs.glade.h:26
-#, fuzzy
 msgid "_Reload"
-msgstr "重新載入"
+msgstr "重新載入(_R)"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "顯示及安裝現有的更新套件"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -960,11 +1010,11 @@ msgstr "更新管理員"
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
-msgstr ""
+msgstr "自動檢查目前的發行版本是否有新的版本及升級到該版本（若果可以）。"
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "檢查有沒有新的發行版本"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -972,32 +1022,34 @@ msgid ""
 "channel list manually. This option allows to hide the reminder shown in this "
 "case."
 msgstr ""
+"如果停用自動更新檢查，您需要自行重新載入套件來源清單。在此情況下本選項允許關"
+"閉更新提示"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "提示重新載入套件來源"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "顯示更新套件的詳細資料"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "儲存 update-manager 對話視窗的大小"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
 "Stores the state of the expander that contains the list of changs and the "
 "description"
-msgstr ""
+msgstr "儲存包含修改紀錄及描述的 expander 的狀態"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "視窗大小"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure software channels and internet updates"
-msgstr ""
+msgstr "設定套件來源及網路更新"
 
 #: ../data/software-properties.desktop.in.h:2
 msgid "Software Properties"
@@ -1007,37 +1059,32 @@ msgstr "軟體屬性"
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../channels/Ubuntu.info.in:6
-#, fuzzy
 msgid "Ubuntu 6.06 'Dapper Drake'"
-msgstr "Ubuntu 5.04 更新"
+msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
 
 #. Description
 #: ../channels/Ubuntu.info.in:23
-#, fuzzy
 msgid "Ubuntu 6.06 Security Updates"
-msgstr "Ubuntu 5.04 安全性更新"
+msgstr "Ubuntu 6.06 安全性更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:40
-#, fuzzy
 msgid "Ubuntu 6.06 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 6.06 更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:57
-#, fuzzy
 msgid "Ubuntu 6.06 Backports"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 6.06 回移套件"
 
 #. Description
 #: ../channels/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
+msgstr "Ubuntu 5.10 ‘Breezy Badger’"
 
 #. Description
 #: ../channels/Ubuntu.info.in:91
@@ -1051,20 +1098,18 @@ msgstr "Ubuntu 5.10 更新"
 
 #. Description
 #: ../channels/Ubuntu.info.in:125
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 5.10 回移套件"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
 msgstr "官方支援"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:131
 msgid "Restricted copyright"
-msgstr "版權受限"
+msgstr "版權受限制"
 
 #. CompDescription
 #: ../channels/Ubuntu.info.in:134
@@ -1080,7 +1125,7 @@ msgstr "非自由軟體 (Multiverse)"
 #: ../channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../channels/Debian.info.in:6
@@ -1090,296 +1135,107 @@ msgstr "Debian 3.1 “Sarge”"
 #. BaseURI
 #: ../channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian 穩定版安全性更新"
+msgstr "Debian 3.1 “Sarge” 安全性更新"
 
 #. Description
 #: ../channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian 測試版"
+msgstr "Debian “Etch”（測試版）"
 
 #. BaseURI
 #: ../channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (不穩定版)"
+msgstr "Debian “Sid”（不穩定版）"
 
 #. CompDescription
 #: ../channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體"
 
 #. CompDescription
 #: ../channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>分類:</b>"
+msgstr "不符合 DFSG 的軟體"
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "官方支援"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>分類:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "由伺服器重新載入套件資料。"
-
-#, fuzzy
-#~ msgid "Add Software Channels"
-#~ msgstr "軟體更新"
+#~ msgid "No valid entry found"
+#~ msgstr "找不到有效的項目"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">下載更改紀錄</span>\n"
-#~ "\n"
-#~ "現在由伺服器下載更改紀錄"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "顯示所有可更新的套件，並選擇要安裝的套件"
-
-#, fuzzy
-#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-#~ msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "移除金鑰時發生錯誤"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "修改軟體來源和設定"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>來源</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "日"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>軟體庫</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>暫存檔</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>介面</b>"
+#~ "While scaning your repository information no valid entry for the upgrade "
+#~ "was found.\n"
+#~ msgstr "掃描套件庫資料作升級時找不到有效的項目。\n"
 
 #~ 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."
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery is now run (dpkg --configure -a)."
 #~ msgstr ""
-#~ "<big><b>認證用金鑰</b></big>\n"
-#~ "\n"
-#~ "您可以在本對話窗內加減認證用的金鑰。這些金鑰可以用來檢查下載的軟體是否完"
-#~ "整。"
+#~ "升級現正中止。您的系統可以會處於不穩定的狀態。執行 (dpkg --configure -a) "
+#~ "來恢復。"
 
 #~ 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. "
+#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
+#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
 #~ msgstr ""
-#~ "將新的金鑰檔加入您信任的鑰匙圈之內。請確保該金鑰是經安全的途徑獲得的，而且"
-#~ "屬於您信任的擁有者。 "
-
-#~ msgid "Add repository..."
-#~ msgstr "加入軟體庫..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "自動檢查軟體更新(_U)"
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "自動清理暫存檔案(_T)"
+#~ "請匯報問題及在報告中請包括檔案 ~/dist-upgrade.log 和 ~/dist-upgrade-apt."
+#~ "log。升級現正中止。 "
 
-#~ msgid "Clean interval in days: "
-#~ msgstr "每隔多少天自動清理: "
+#~ msgid "You can install one update"
+#~ msgid_plural "You can install %s updates"
+#~ msgstr[0] "您可以安裝 1 個更新套件"
+#~ msgstr[1] "您可以安裝 %s 個更新套件"
 
-#~ 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 "Repositories changed"
+#~ msgstr "套件庫已變更"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr "將發行版本提供的預設金鑰還原。這個程序不會更改用戶自行安裝的金鑰。"
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "指定套件快取的大小上限(_M)"
-
-#~ msgid "Settings"
-#~ msgstr "設定"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "顯示詳細套件版本資訊"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "顯示被停用的軟體來源"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "每隔多少天自動更新: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "加入軟體庫(_A)"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "下載所有可以更新的套件(_D)"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>狀態:</b>"
+#~ "You need to reload the package list from the servers for your changes to "
+#~ "take effect. Do you want to do this now?"
+#~ msgstr "您需要重新載入在伺服器中的套件清單使變更生效。現在要這樣做？"
 
 #~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
+#~ "<big><b>Analysing your system</b></big>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
 #~ msgstr ""
-#~ "<big><b>Available Updates</b></big>\n"
+#~ "<big><b>正在分析您的系統</b></big>\n"
 #~ "\n"
-#~ "以下的軟體是可以更新的。您可以按「安裝」按鈕開始更新。"
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "取消下載更改紀錄"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "您需要 root 的身分方可使用本程式"
-
-#~ msgid "Binary"
-#~ msgstr "可執行檔"
-
-#~ msgid "Source"
-#~ msgstr "源程式碼"
-
-#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\""
-#~ msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
-
-#~ msgid "Ubuntu 4.10 Security Updates"
-#~ msgstr "Ubuntu 4.10 安全性更新"
-
-#~ msgid "Ubuntu 4.10 Updates"
-#~ msgstr "Ubuntu 4.10 更新"
-
-#~ msgid "Contributed software"
-#~ msgstr "協力維護軟體"
-
-#~ msgid "Non-free software"
-#~ msgstr "非自由軟體"
-
-#~ msgid "US export restricted software"
-#~ msgstr "美國禁止出口軟體"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 “Woody”"
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian 穩定版"
-
-#~ msgid "Debian Unstable \"Sid\""
-#~ msgstr "Debian 不穩定版 “Sid”"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (穩定版)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (測試版)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu 套件自動簽署用金鑰 <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu 光碟自動簽署用金鑰 <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "選擇金鑰檔"
-
-#~ msgid "There is one package available for updating."
-#~ msgstr "有 1 個套件可以更新。"
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "有 %s 個套件可以更新。"
-
-#~ msgid "There are no updated packages"
-#~ msgstr "沒有任何套件需要更新"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "您沒有選取 %s 個更新套件中的任何一個"
-#~ msgstr[1] "您沒有選取 %s 個更新套件中的任何一個"
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "您選取了 %s 個更新套件，大小為 %s"
-#~ msgstr[1] "您選取了 %s 個更新套件，大小為 %s"
-
-#, fuzzy
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "您選取了 %2$s 個更新套件中的 %1$s 個，大小為 %3$s"
-#~ msgstr[1] "您選取了 %2$s 個更新套件中的 %1$s 個，大小總共為 %3$s"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "現在安裝更新套件。"
+#~ "軟體更新能夠修正錯誤、防止安全漏洞及增加新的功能。"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr "您在任何時候只可以執行一個套件管理員程式。請關閉其它程式。"
-
-#~ msgid "Updating package list..."
-#~ msgstr "正在更新套件清單..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "沒有任何軟體可以更新。"
-
-#~ msgid "New version:"
-#~ msgstr "新版本:"
+#~ "Software updates can correct errors, eliminate security vulnerabilities, "
+#~ "and provide new features to you."
+#~ 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."
+#~ "Only security updates from the official Ubuntu servers will be installed "
+#~ "automatically. The software package \"unattended-upgrades\" needs to be "
+#~ "installed therefor"
 #~ msgstr ""
-#~ "請升級至新版本的 Ubuntu Linux。您現在用的版本不會再有任何安全性更新或重要"
-#~ "的更新。有關升級的資訊，請瀏覽 http://www.ubuntulinux.org 。"
+#~ "只有來自 ubuntu 官方伺服器的安全性更新會自動安裝。需要安裝軟體套"
+#~ "件“unattended-upgrades”"
 
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Ubuntu 已推出新版本！"
+#~ msgid "<b>Sections</b>"
+#~ msgstr "<b>組別：</b>"
 
 #~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
+#~ "b></big>\n"
+#~ "\n"
+#~ "The APT line contains the type, location and sections of a channel, for "
+#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 #~ msgstr ""
-#~ "名稱為 “%s” 的新版本已經推出。請瀏覽 http://www.ubuntulinux.org/ 獲取有關"
-#~ "升級的指引。"
-
-#~ msgid "Never show this message again"
-#~ msgstr "以後不再顯示此訊息"
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "沒有更改紀錄，可能伺服器資訊未更新。"
+#~ "<big><b>請輸入要加入的套件來源的 APT 套件庫位置</b></big>\n"
+#~ "\n"
+#~ "APT 套件庫位置 (APT line) 包括套件來源的類型、位置和組別，例如： <i>“deb "
+#~ "http://ftp.debian.org sarge main”</i>。"