+ merged from mvo

3 files changed, 18 insertions, 18 deletions

diff --git a/UpdateManager/GtkProgress.py b/UpdateManager/GtkProgress.py
index 9dd8d6f1..704946c7 100644
--- a/UpdateManager/GtkProgress.py
+++ b/UpdateManager/GtkProgress.py
@@ -32,8 +32,8 @@ class GtkOpProgress(apt.OpProgress):
         self._window = window
         self._status = status
         self._progressbar = progressbar
-        self._progressbar.set_pulse_step(0.01)
-        self._progressbar.pulse()
+        #self._progressbar.set_pulse_step(0.01)
+        #self._progressbar.pulse()
         window.set_transient_for(parent)
     def update(self, percent):
         #print percent
@@ -44,11 +44,11 @@ class GtkOpProgress(apt.OpProgress):
         self._window.show()
         self._parent.set_sensitive(False)
         self._status.set_markup("<i>%s</i>" % self.op)
-        #self._progressbar.set_fraction(percent/100.0)
-        if percent > 99:
-            self._progressbar.set_fraction(1)
-        else:
-            self._progressbar.pulse()
+        self._progressbar.set_fraction(percent/100.0)
+        #if percent > 99:
+        #    self._progressbar.set_fraction(1)
+        #else:
+        #    self._progressbar.pulse()
         while gtk.events_pending():
             gtk.main_iteration()
     def done(self):
diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py
index c5d28212..0bc8dc05 100644
--- a/UpdateManager/MetaRelease.py
+++ b/UpdateManager/MetaRelease.py
@@ -157,7 +157,7 @@ class MetaRelease(gobject.GObject):
             self.metarelease_information=f
             uri.close()
         except urllib2.URLError:
-            if os.path.exits(self.METARELEASE_FILE):
+            if os.path.exists(self.METARELEASE_FILE):
                 f=open(self.METARELEASE_FILE,"r")
 
 # register in the gobject system, needed for older versions of pygtk,
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 71bbd351..de77f041 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -479,10 +479,10 @@ class UpdateManager(SimpleGladeApp):
 	# FIXME: wording
         dialog.set_markup("<span weight=\"bold\" size=\"larger\">%s</span>"%\
                           _("Could not reload the update information"))
-        #dialog.format_secondary_text(_("An error occured during the package "
-        #                               "list reload. Please see the below "
-        #                               "information for details what went "
-        #                               "wrong."))
+        dialog.format_secondary_text(_("An error occured during the package "
+                                       "list reload. Please see the below "
+                                       "information for details what went "
+                                       "wrong."))
         diaolg.set_title("")
         dialog.set_border_width(6)
         dialog.set_size_request(width=500,height=-1)
@@ -705,9 +705,10 @@ class UpdateManager(SimpleGladeApp):
   def dist_no_longer_supported(self, meta_release):
     msg = "<big><b>%s</b></big>\n\n%s" % \
           (_("Your distribution is not supported anymore"),
-	   _("You will not get any further security fixes or critical updates. "
+	   _("You will not get any further security fixes or critical "
+             "updates. "
              "Upgrade to a later version of Ubuntu Linux. See "
-             "http://www.ubuntulinux.org for more information on "
+             "http://www.ubuntu.com for more information on "
              "upgrading."))
     dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_WARNING,
                                gtk.BUTTONS_CLOSE,"")
@@ -743,8 +744,7 @@ class UpdateManager(SimpleGladeApp):
           except urllib2.HTTPError:
               primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
                         _("Could not find the release notes")
-              secondary = _("Please check your software sources. Only use " \
-			    "official Ubuntu servers and mirrors.")
+              secondary = _("The server may be overloaded. ")
               dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL,
                                          gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"")
               dialog.set_title("")
@@ -801,8 +801,8 @@ class UpdateManager(SimpleGladeApp):
               # no script file found in extracted tarbal
               primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
                         _("Could not run the upgrade tool")
-              secondary = _("Please check your software sources. Only use " \
-			    "official Ubuntu servers and mirrors.")
+              secondary = _("This is most likely a bug in the upgrade tool. "
+                            "Please report it as a bug")
               dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL,
                                          gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"")
               dialog.set_title("")