Merge lp:~dylanmccall/update-manager/dialogs-refactor into lp:update-manager

[Dylan McCall]

With this branch, I am proposing some refactoring of update-manager's various screens so they all use the same base class, "Dialog", which is typically a Gtk widget that can be added as a child of the application's main window.

Previously, the design of the application meant we used Dialog sometimes, but not always, with the UpdatesAvailable screen being a particularly noteworthy omission. To deal with all these different screens, whenever UpdateManager wanted to show a new screen it would call that screen's start method, and then the screen itself would effectively take control of the main window. This meant adding new widgets, hiding the main window, making it resizable, and the like; which also meant code duplication, several calls to Gtk.main, and a strong smell of feature envy :) With my design, I'm trying to adopt a more conventional layout, using the Dialog class throughout, as a GTK widget wherever possible. (The settings dialog and InstallBackendSynaptic keep us from being all internal Gtk widgets all the time, but we're really close).

There is now a little less code (diffstat: 11 files changed, 747 insertions(+), 1074 deletions(-)), and it should be much easier to make a single change and have it apply logically across the application. In addition, because the main window has a better handle on its children, this paves the way for us to implement pretty transitions between screens, for example using the new-fangled GtkRevealer widget. Originally this would have meant changing every screen to deal with a new container in the main window. With this change, we can do it all in UpdateManager.py.

[lp:~dylanmccall/update-manager/dialogs-refactor]

2634. By Dylan McCall on 2013-05-20

Put back the "backend" module. It wasn't necessary to move it in this branch.

2635. By Dylan McCall on 2013-05-20

Removed unnecessary layout changes in InstallBackendAptdaemon. Progress dialog should not wiggle when it first appears, now.

2636. By Dylan McCall on 2013-05-20

Fix packaging and pot files.
Put back the 6px margin above header label in each dialog.

2637. By Dylan McCall on 2013-05-21

Progress dialog is resizable while downloading packages, too.

[Dimitri John Ledkov (xnox)]

Looks good to me. Installed and running this version of update-manager. Will report any bugs / regression. So far everything looks good.

review: Approve

[Sebastien Bacher (seb128)]

Those changes seem to have a created https://bugs.launchpad.net/ubuntu/+source/update-manager/+bug/1200775 (apturl stopped working on "AttributeError: 'InstallBackendAptdaemon' object has no attribute 'connect'")

[Sebastien Bacher (seb128)]

That merge is also creating https://errors.ubuntu.com/problem/3ca9b88401b3789ff4d00462be7b20206f60e181

_action_done() is calling "self.window_main.start_error(False, error_string, error_desc)", or window_main is a GtkDialog not an UpdateManager object anymore, so it doesn't have that function

Dylan, do you think you could look at that?

[Sebastien Bacher (seb128)]

I've opened https://bugs.launchpad.net/ubuntu/+source/update-manager/+bug/1258112 about the most recently described issue

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2013-01-09 21:04:35 +0000
+++ UpdateManager/Dialogs.py	2013-05-21 05:43:25 +0000
@@ -24,6 +24,7 @@
 
 from gi.repository import Gtk
 from gi.repository import Gdk
+from gi.repository import GLib
 from gi.repository import GObject
 GObject.threads_init()
 
@@ -31,39 +32,79 @@
 warnings.filterwarnings(
     "ignore", "Accessed deprecated property", DeprecationWarning)
 
+import logging
 import dbus
 import os
 import subprocess
 import sys
-from .SimpleGtkbuilderApp import SimpleGtkbuilderApp
 
 from gettext import gettext as _
 
 
-class Dialog(SimpleGtkbuilderApp):
+class Dialog(object):
     def __init__(self, window_main):
         self.window_main = window_main
-        self.focus_button = None
-        SimpleGtkbuilderApp.__init__(
-            self,
-            self.window_main.datadir + "/gtkbuilder/Dialog.ui",
-            "update-manager")
-
-    def main(self):
-        self.window_main.push(self.pane_dialog, self)
-        if self.focus_button:
-            self.focus_button.grab_focus()
-
-    def run(self, parent=None):
-        if self.focus_button:
-            self.focus_button.grab_focus()
+
+    def start(self):
+        pass
+
+    def close(self):
+        return self.stop()
+
+    def stop(self):
+        pass
+
+    def run(self, parent=None):
+        pass
+
+
+class BuilderDialog(Dialog, Gtk.Alignment):
+    def __init__(self, window_main, ui_path, root_widget):
+        Dialog.__init__(self, window_main)
+        Gtk.Alignment.__init__(self)
+
+        builder = self._load_ui(ui_path, root_widget)
+        self.add(builder.get_object(root_widget))
+        self.show()
+
+    def _load_ui(self, path, root_widget, domain="update-manager"):
+        builder = Gtk.Builder()
+        builder.set_translation_domain(domain)
+        builder.add_objects_from_file(path, [root_widget])
+        builder.connect_signals(self)
+
+        for o in builder.get_objects():
+            if issubclass(type(o), Gtk.Buildable):
+                name = Gtk.Buildable.get_name(o)
+                setattr(self, name, o)
+            else:
+                logging.debug("WARNING: can not get name for '%s'" % o)
+
+        return builder
+
+    def run(self, parent=None):
+        # FIXME: THIS WILL CRASH!
         if parent:
             self.window_dialog.set_transient_for(parent)
             self.window_dialog.set_modal(True)
         self.window_dialog.run()
 
-    def close(self):
-        sys.exit(0)  # By default, exit the app
+
+class InternalDialog(BuilderDialog):
+    def __init__(self, window_main, content_widget=None):
+        ui_path = os.path.join(window_main.datadir, "gtkbuilder/Dialog.ui")
+        BuilderDialog.__init__(self, window_main, ui_path, "pane_dialog")
+
+        self.focus_button = None
+        self.set_content_widget(content_widget)
+        self.connect("realize", self._on_realize)
+
+    def _on_realize(self, user_data):
+        if self.focus_button:
+            self.focus_button.set_can_default(True)
+            self.focus_button.set_can_focus(True)
+            self.focus_button.grab_default()
+            self.focus_button.grab_focus()
 
     def add_button(self, label, callback, secondary=False):
         # from_stock tries stock first and falls back to mnemonic
@@ -83,48 +124,50 @@
             return None
 
     def on_settings_button_clicked(self):
-        cmd = ["/usr/bin/software-properties-gtk",
-               "--open-tab", "2",
-               # FIXME: once get_xid() is available via introspections, add
-               #        this back
-               #"--toplevel", "%s" % self.window_main.get_window().get_xid()
-               ]
-        subprocess.Popen(cmd)
+        self.window_main.show_settings()
 
     def set_header(self, label):
-        self.label_header.set_label(label)
+        if label:
+            self.label_header.set_markup(
+                "<span size='larger' weight='bold'>%s</span>" % label)
+        self.label_header.set_visible(bool(label))
 
     def set_desc(self, label):
-        self.label_desc.set_label(label)
+        if label:
+            self.label_desc.set_markup(label)
         self.label_desc.set_visible(bool(label))
 
+    def set_content_widget(self, content_widget):
+        if content_widget:
+            self.main_container.add(content_widget)
+        self.main_container.set_visible(bool(content_widget))
 
-class StoppedUpdatesDialog(Dialog):
+class StoppedUpdatesDialog(InternalDialog):
     def __init__(self, window_main):
-        Dialog.__init__(self, window_main)
+        InternalDialog.__init__(self, window_main)
         self.set_header(_("You stopped the check for updates."))
         self.add_settings_button()
         self.add_button(_("_Check Again"), self.check)
-        self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+        self.focus_button = self.add_button(Gtk.STOCK_OK, self.window_main.close)
 
     def check(self):
         self.window_main.start_update()
 
 
-class NoUpdatesDialog(Dialog):
+class NoUpdatesDialog(InternalDialog):
     def __init__(self, window_main, error_occurred=False):
-        Dialog.__init__(self, window_main)
+        InternalDialog.__init__(self, window_main)
         if error_occurred:
             self.set_header(_("No software updates are available."))
         else:
             self.set_header(_("The software on this computer is up to date."))
         self.add_settings_button()
-        self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
-
-
-class DistUpgradeDialog(Dialog):
+        self.focus_button = self.add_button(Gtk.STOCK_OK, self.window_main.close)
+
+
+class DistUpgradeDialog(InternalDialog):
     def __init__(self, window_main, meta_release):
-        Dialog.__init__(self, window_main)
+        InternalDialog.__init__(self, window_main)
         self.meta_release = meta_release
         self.set_header(_("The software on this computer is up to date."))
         # Translators: these are Ubuntu version names like "Ubuntu 12.04"
@@ -134,7 +177,7 @@
                       meta_release.current_dist_version))
         self.add_settings_button()
         self.add_button(_("Upgrade…"), self.upgrade)
-        self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+        self.focus_button = self.add_button(Gtk.STOCK_OK, self.window_main.close)
 
     def upgrade(self):
         # Pass on several arguments
@@ -169,9 +212,9 @@
         DistUpgradeDialog.run(self, parent)
 
 
-class PartialUpgradeDialog(Dialog):
+class PartialUpgradeDialog(InternalDialog):
     def __init__(self, window_main):
-        Dialog.__init__(self, window_main)
+        InternalDialog.__init__(self, window_main)
         self.set_header(_("Not all updates can be installed"))
         self.set_desc(_(
             """Run a partial upgrade, to install as many updates as possible.
@@ -191,24 +234,24 @@
                  "/usr/lib/ubuntu-release-upgrader/do-partial-upgrade "
                  "--frontend=DistUpgradeViewGtk3")
 
-    def main(self):
-        Dialog.main(self)
+    def start(self):
+        Dialog.start(self)
         # Block progress until user has answered this question
         Gtk.main()
 
 
-class ErrorDialog(Dialog):
+class ErrorDialog(InternalDialog):
     def __init__(self, window_main, header, desc=None):
-        Dialog.__init__(self, window_main)
+        InternalDialog.__init__(self, window_main)
         self.set_header(header)
         if desc:
             self.set_desc(desc)
             self.label_desc.set_selectable(True)
         self.add_settings_button()
-        self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+        self.focus_button = self.add_button(Gtk.STOCK_OK, self.window_main.close)
 
-    def main(self):
-        Dialog.main(self)
+    def start(self):
+        Dialog.start(self)
         # The label likes to start selecting everything (b/c it got focus
         # before we switched to our default button).
         self.label_desc.select_region(0, 0)
@@ -229,17 +272,16 @@
         self.window_main.start_available(error_occurred=True)
 
 
-class NeedRestartDialog(Dialog):
+class NeedRestartDialog(InternalDialog):
     def __init__(self, window_main):
-        Dialog.__init__(self, window_main)
+        InternalDialog.__init__(self, window_main)
         self.set_header(
             _("The computer needs to restart to finish installing updates."))
         self.focus_button = self.add_button(_("_Restart"), self.restart)
 
-    def main(self):
-        Dialog.main(self)
+    def start(self):
+        Dialog.start(self)
         # Turn off close button
-        self.window_main.realize()
         self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE |
                                                     Gdk.WMFunction.MINIMIZE)
 

=== removed file 'UpdateManager/InstallProgress.py'
--- UpdateManager/InstallProgress.py	2012-12-13 20:39:37 +0000
+++ UpdateManager/InstallProgress.py	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-# InstallProgress.py
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-#  Copyright (c) 2004-2012 Canonical
-#                2004 Michiel Sikkes
-#                2005 Martin Willemoes Hansen
-#                2010 Mohamed Amine IL Idrissi
-#
-#  Author: Michiel Sikkes <[e-mail]>
-#          Michael Vogt <[e-mail]>
-#          Martin Willemoes Hansen <[e-mail]>
-#          Mohamed Amine IL Idrissi <[e-mail]>
-#          Alex Launi <[e-mail]>
-#          Michael Terry <[e-mail]>
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-#  USA
-
-from __future__ import absolute_import, print_function
-
-import warnings
-warnings.filterwarnings("ignore", "Accessed deprecated property",
-                        DeprecationWarning)
-
-import os
-import sys
-
-from .backend import get_backend
-
-from .Core.utils import (inhibit_sleep,
-                         allow_sleep)
-
-
-class InstallProgress(object):
-
-    def __init__(self, app):
-        self.window_main = app
-        self.datadir = app.datadir
-        self.options = app.options
-
-        # Used for inhibiting power management
-        self.sleep_cookie = None
-        self.sleep_dev = None
-
-        # get the install backend
-        self.install_backend = get_backend(self.datadir, self.window_main)
-        self.install_backend.connect("action-done", self._on_backend_done)
-
-    def invoke_manager(self):
-        # don't display apt-listchanges, we already showed the changelog
-        os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
-
-        # Do not suspend during the update process
-        (self.sleep_dev, self.sleep_cookie) = inhibit_sleep()
-
-        # If the progress dialog should be closed automatically afterwards
-        #settings = Gio.Settings("com.ubuntu.update-manager")
-        #close_on_done = settings.get_boolean("autoclose-install-window")
-        # FIXME: confirm with mpt whether this should still be a setting
-        close_on_done = False
-
-        # Get the packages which should be installed and update
-        pkgs_install = []
-        pkgs_upgrade = []
-        for pkg in self.window_main.cache:
-            if pkg.marked_install:
-                pkgs_install.append(pkg.name)
-            elif pkg.marked_upgrade:
-                pkgs_upgrade.append(pkg.name)
-        self.install_backend.commit(pkgs_install, pkgs_upgrade, close_on_done)
-
-    def _on_backend_done(self, backend, action, authorized, success,
-                         error_string, error_desc):
-        # Allow suspend after synaptic is finished
-        if self.sleep_cookie:
-            allow_sleep(self.sleep_dev, self.sleep_cookie)
-            self.sleep_cookie = self.sleep_dev = None
-
-        # Either launch main dialog and continue or quit altogether
-        if success:
-            self.window_main.start_available()
-        elif error_string:
-            self.window_main.start_error(False, error_string, error_desc)
-        else:
-            sys.exit(0)
-
-    def main(self):
-        self.invoke_manager()

=== removed file 'UpdateManager/SimpleGtkbuilderApp.py'
--- UpdateManager/SimpleGtkbuilderApp.py	2012-11-19 16:33:28 +0000
+++ UpdateManager/SimpleGtkbuilderApp.py	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-
-"""
- SimpleGladeApp.py
- Module that provides an object oriented abstraction to pygtk and libglade.
- Copyright (C) 2004 Sandino Flores Moreno
-"""
-
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-
-import logging
-
-from gi.repository import Gtk
-
-
-# based on SimpleGladeApp
-class SimpleGtkbuilderApp:
-
-    def __init__(self, path, domain):
-        self.builder = Gtk.Builder()
-        self.builder.set_translation_domain(domain)
-        self.builder.add_from_file(path)
-        self.builder.connect_signals(self)
-        for o in self.builder.get_objects():
-            if issubclass(type(o), Gtk.Buildable):
-                name = Gtk.Buildable.get_name(o)
-                setattr(self, name, o)
-            else:
-                logging.debug("WARNING: can not get name for '%s'" % o)
-
-    def run(self):
-        """
-        Starts the main loop of processing events checking for Control-C.
-
-        The default implementation checks wheter a Control-C is pressed,
-        then calls on_keyboard_interrupt().
-
-        Use this method for starting programs.
-        """
-        try:
-            Gtk.main()
-        except KeyboardInterrupt:
-            self.on_keyboard_interrupt()
-
-    def on_keyboard_interrupt(self):
-        """
-        This method is called by the default implementation of run()
-        after a program is finished by pressing Control-C.
-        """
-        pass

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2013-03-01 18:21:56 +0000
+++ UpdateManager/UpdateManager.py	2013-05-21 05:43:25 +0000
@@ -23,7 +23,7 @@
 from __future__ import absolute_import, print_function
 
 from gi.repository import Gtk
-from gi.repository import Gdk
+from gi.repository import Gdk, GdkX11
 from gi.repository import Gio
 from gi.repository import GLib
 
@@ -33,7 +33,9 @@
 
 import apt_pkg
 import os
+import subprocess
 import sys
+import time
 from gettext import gettext as _
 
 import dbus
@@ -50,22 +52,22 @@
                       PartialUpgradeDialog,
                       UnsupportedDialog,
                       UpdateErrorDialog)
-from .InstallProgress import InstallProgress
 from .MetaReleaseGObject import MetaRelease
-from .UpdateProgress import UpdateProgress
 from .UpdatesAvailable import UpdatesAvailable
 from .Core.AlertWatcher import AlertWatcher
 from .Core.MyCache import MyCache
 from .Core.roam import NetworkManagerHelper
 from .Core.UpdateList import UpdateList
+from .backend import (InstallBackend,
+                      get_backend)
 
 # file that signals if we need to reboot
 REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
 
 
 class UpdateManager(Gtk.Window):
-    """ This class is the main window and work flow controller.  Panes will add
-        themselves to the main window and it will morph between them."""
+    """ This class is the main window and work flow controller. The main
+        window will show panes, and it will morph between them. """
 
     def __init__(self, datadir, options):
         Gtk.Window.__init__(self)
@@ -82,16 +84,14 @@
         # Basic GTK+ parameters
         self.set_title(_("Software Updater"))
         self.set_icon_name("system-software-update")
-        self.set_resizable(False)
         self.set_position(Gtk.WindowPosition.CENTER)
 
         # Keep window at a constant size
         ctx = self.get_style_context()
         ctx.connect("changed", lambda ctx: self.resize_to_standard_width())
-        self.resize_to_standard_width()
 
         # Signals
-        self.connect("delete-event", self.close)
+        self.connect("delete-event", self._on_close)
 
         self._setup_dbus()
 
@@ -110,6 +110,17 @@
             self.options and self.options.devel_release,
             self.options and self.options.use_proposed)
 
+    def begin_user_resizable(self, stored_width=0, stored_height=0):
+        self.set_resizable(True)
+        if stored_width > 0 and stored_height > 0:
+            # There is a race here.  If we immediately resize, it often doesn't
+            # take.  Using idle_add helps, but we *still* occasionally don't
+            # restore the size correctly.  Help needed to track this down!
+            GLib.idle_add(lambda: self.resize(stored_width, stored_height))
+
+    def end_user_resizable(self):
+        self.set_resizable(False)
+
     def resize_to_standard_width(self):
         if self.get_resizable():
             return  # only size to a specific em if we are a static size
@@ -130,56 +141,77 @@
         self.disconnect(self.initial_focus_id)
         return False
 
-    def push(self, pane, controller):
-        child = self.get_child()
-        if child is not None:
-            if self.controller and hasattr(self.controller, "save_state"):
-                self.controller.save_state()
-            child.destroy()
+    def _start_pane(self, pane):
+        if self.controller is not None:
+            self.controller.stop()
+            if isinstance(self.controller, Gtk.Widget):
+                self.controller.destroy()
+
+        self.controller = pane
+        self._look_ready()
+        self.end_user_resizable()
 
         if pane is None:
-            self.controller = None
             return
 
-        pane.reparent(self)
-        self.controller = controller
-
-        # Reset state
-        self.set_resizable(False)
-        self.resize_to_standard_width()
-        self.set_sensitive(True)
-        if self.get_window() is not None:
-            self.get_window().set_cursor(None)
-            self.get_window().set_functions(Gdk.WMFunction.ALL)
-
-        if self.controller and hasattr(self.controller, "restore_state"):
-            self.controller.restore_state()
-
-        pane.show()
-        self.show()
-
-    def close(self, widget, data=None):
+        if isinstance(pane, Gtk.Widget):
+            self.add(pane)
+            pane.start()
+            self.show_all()
+        else:
+            pane.start()
+            self.hide()
+
+    def _on_close(self, widget, data=None):
+        self.close()
+
+    def close(self):
         if not self.get_sensitive():
             return True
 
-        if self.controller and hasattr(self.controller, "close"):
-            # let controller handle it as they will
-            if self.controller.close():
-                return
-
+        controller_close = self.controller.close()
+        if controller_close:
+            return controller_close
         self.exit()
 
     def exit(self):
         """ exit the application, save the state """
-        self.push(None, None)
+        self._start_pane(None)
         sys.exit(0)
 
+    def show_settings(self):
+        try:
+            apt_pkg.pkgsystem_unlock()
+        except SystemError:
+            pass
+        cmd = ["/usr/bin/software-properties-gtk",
+               "--open-tab", "2",
+               "--toplevel", "%s" % self.get_window().get_xid()
+               ]
+        self._look_busy()
+        try:
+            p = subprocess.Popen(cmd)
+        except OSError:
+            pass
+        else:
+            while p.poll() is None:
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
+                time.sleep(0.05)
+        finally:
+            self.start_available()
+
     def start_update(self):
         if self.options.no_update:
             self.start_available()
             return
 
-        self._start_pane(UpdateProgress(self))
+        update_backend = get_backend(self, InstallBackend.ACTION_UPDATE)
+        self._start_pane(update_backend)
+
+    def start_install(self):
+        install_backend = get_backend(self, InstallBackend.ACTION_INSTALL)
+        self._start_pane(install_backend)
 
     def start_available(self, cancelled_update=False, error_occurred=False):
         self._look_busy()
@@ -214,24 +246,23 @@
                          "a previous check.")
             return UpdatesAvailable(self, header, desc)
 
-    def start_install(self):
-        self._start_pane(InstallProgress(self))
-
     def start_error(self, is_update_error, header, desc):
         if is_update_error:
             self._start_pane(UpdateErrorDialog(self, header, desc))
         else:
             self._start_pane(ErrorDialog(self, header, desc))
 
-    def _start_pane(self, pane):
-        self._look_busy()
-        pane.main()
-
     def _look_busy(self):
         self.set_sensitive(False)
         if self.get_window() is not None:
             self.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
 
+    def _look_ready(self):
+        self.set_sensitive(True)
+        if self.get_window() is not None:
+            self.get_window().set_cursor(None)
+            self.get_window().set_functions(Gdk.WMFunction.ALL)
+
     def _check_meta_release(self):
         if self.meta_release is None:
             return None

=== removed file 'UpdateManager/UpdateProgress.py'
--- UpdateManager/UpdateProgress.py	2012-12-13 20:39:37 +0000
+++ UpdateManager/UpdateProgress.py	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-# UpdateProgress.py
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-#  Copyright (c) 2004-2012 Canonical
-#                2004 Michiel Sikkes
-#                2005 Martin Willemoes Hansen
-#                2010 Mohamed Amine IL Idrissi
-#
-#  Author: Michiel Sikkes <[e-mail]>
-#          Michael Vogt <[e-mail]>
-#          Martin Willemoes Hansen <[e-mail]>
-#          Mohamed Amine IL Idrissi <[e-mail]>
-#          Alex Launi <[e-mail]>
-#          Michael Terry <[e-mail]>
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-#  USA
-
-from __future__ import absolute_import, print_function
-
-import warnings
-warnings.filterwarnings("ignore", "Accessed deprecated property",
-                        DeprecationWarning)
-
-import os
-
-from .backend import get_backend
-
-from .Core.utils import inhibit_sleep, allow_sleep
-
-
-class UpdateProgress(object):
-
-    def __init__(self, app):
-        self.window_main = app
-        self.datadir = app.datadir
-        self.options = app.options
-
-        # Used for inhibiting power management
-        self.sleep_cookie = None
-        self.sleep_dev = None
-
-        # get the install backend
-        self.install_backend = get_backend(self.datadir, self.window_main)
-        self.install_backend.connect("action-done", self._on_backend_done)
-
-    def invoke_manager(self):
-        # don't display apt-listchanges
-        os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
-
-        # Do not suspend during the update process
-        (self.sleep_dev, self.sleep_cookie) = inhibit_sleep()
-
-        self.install_backend.update()
-
-    def _on_backend_done(self, backend, action, authorized, success,
-                         error_string, error_desc):
-        # Allow suspend after synaptic is finished
-        if self.sleep_cookie:
-            allow_sleep(self.sleep_dev, self.sleep_cookie)
-            self.sleep_cookie = self.sleep_dev = None
-
-        if error_string:
-            self.window_main.start_error(True, error_string, error_desc)
-        else:
-            self.window_main.start_available(not success)
-
-    def main(self):
-        self.invoke_manager()

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2013-03-05 18:02:34 +0000
+++ UpdateManager/UpdatesAvailable.py	2013-05-21 05:43:25 +0000
@@ -48,22 +48,20 @@
 import os
 import re
 import logging
-import subprocess
 import time
 import threading
 
 from gettext import gettext as _
 from gettext import ngettext
 
-
 from .Core.utils import humanize_size
 from .Core.AlertWatcher import AlertWatcher
 from .Core.UpdateList import UpdateSystemGroup
+from .Dialogs import InternalDialog
 
 from DistUpgrade.DistUpgradeCache import NotEnoughFreeSpaceError
 
 from .ChangelogViewer import ChangelogViewer
-from .SimpleGtkbuilderApp import SimpleGtkbuilderApp
 from .UnitySupport import UnitySupport
 
 
@@ -205,40 +203,52 @@
             return cell_start
 
 
-class UpdatesAvailable(SimpleGtkbuilderApp):
+class UpdatesAvailable(InternalDialog):
     APP_INSTALL_ICONS_PATH = "/usr/share/app-install/icons"
 
-    def __init__(self, app, header=None, desc=None):
-        self.window_main = app
-        self.datadir = app.datadir
-        self.options = app.options
-        self.cache = app.cache
-        self.list = app.update_list
-        SimpleGtkbuilderApp.__init__(
-            self,
-            self.datadir + "/gtkbuilder/UpdateManager.ui",
-            "update-manager")
+    def __init__(self, window_main, header=None, desc=None):
+        InternalDialog.__init__(self, window_main)
+
+        self.window_main = window_main
+        self.datadir = window_main.datadir
+        self.cache = window_main.cache
+
+        self.custom_header = header
+        self.custom_desc = desc
+
+        content_ui_path = os.path.join(self.datadir, "gtkbuilder/UpdateManager.ui")
+        self._load_ui(content_ui_path, "pane_updates_available")
+        self.set_content_widget(self.pane_updates_available)
+
+        self.dl_size = 0
+        self.connected = True
 
         # Used for inhibiting power management
         self.sleep_cookie = None
         self.sleep_dev = None
 
-        # workaround for LP: #945536
-        self.clearing_store = False
-
-        self.custom_header = header
-        self.custom_desc = desc
-
-        self.button_close.grab_focus()
-        self.dl_size = 0
-        self.connected = True
-
         self.settings = Gio.Settings("com.ubuntu.update-manager")
 
         # Special icon theme for looking up app-install-data icons
         self.app_icons = Gtk.IconTheme()
         self.app_icons.append_search_path(self.APP_INSTALL_ICONS_PATH)
 
+        # Create Unity launcher quicklist
+        # FIXME: instead of passing parent we really should just send signals
+        self.unity = UnitySupport(parent=self)
+
+        # setup the help viewer and disable the help button if there
+        # is no viewer available
+        #self.help_viewer = HelpViewer("update-manager")
+        #if self.help_viewer.check() == False:
+        #    self.button_help.set_sensitive(False)
+
+        self.add_settings_button()
+        self.button_close = self.add_button(Gtk.STOCK_CANCEL, self.window_main.close)
+        self.button_install = self.add_button(_("Install Now"),
+            self.on_button_install_clicked)
+        self.focus_button = self.button_install
+
         # create text view
         self.textview_changes = ChangelogViewer()
         self.textview_changes.show()
@@ -246,27 +256,9 @@
         changes_buffer = self.textview_changes.get_buffer()
         changes_buffer.create_tag("versiontag", weight=Pango.Weight.BOLD)
 
-        # expander
-        self.expander_details.set_expanded(
-            self.settings.get_boolean("show-details"))
-        self.expander_details.connect("activate", self.pre_activate_details)
-        self.expander_details.connect("notify::expanded",
-                                      self.activate_details)
-        self.expander_desc.connect("notify::expanded", self.activate_desc)
-
-        # useful exit stuff
-        self.button_close.connect("clicked", lambda w: self.window_main.exit())
-
-        # If auto-updates are on, change cancel label
-        self.notifier_settings = Gio.Settings("com.ubuntu.update-notifier")
-        self.notifier_settings.connect(
-            "changed::auto-launch",
-            lambda s, p: self.update_close_button())
-        self.update_close_button()
-
         # the treeview (move into it's own code!)
         self.store = Gtk.TreeStore(str, GObject.TYPE_PYOBJECT, str, bool)
-        self.treeview_update.set_model(self.store)
+        self.treeview_update.set_model(None)
 
         restart_icon_renderer = Gtk.CellRendererPixbuf()
         restart_icon_renderer.set_property("xpad", 4)
@@ -280,9 +272,9 @@
         restart_column.set_cell_data_func(restart_icon_renderer,
                                           self.restart_icon_renderer_data_func)
 
-        pkg_area = CellAreaPackage(bool(self.list.security_groups))
-        pkg_column = Gtk.TreeViewColumn.new_with_area(pkg_area)
-        pkg_area.column = pkg_column
+        self.pkg_cell_area = CellAreaPackage(False)
+        pkg_column = Gtk.TreeViewColumn.new_with_area(self.pkg_cell_area)
+        self.pkg_cell_area.column = pkg_column
         pkg_column.set_title(_("Install"))
         pkg_column.set_property("spacing", 4)
         pkg_column.set_expand(True)
@@ -331,24 +323,26 @@
         self.treeview_update.connect("button-press-event",
                                      self.on_treeview_button_press)
 
-        # setup the help viewer and disable the help button if there
-        # is no viewer available
-        #self.help_viewer = HelpViewer("update-manager")
-        #if self.help_viewer.check() == False:
-        #    self.button_help.set_sensitive(False)
-
-        if not os.path.exists("/usr/bin/software-properties-gtk"):
-            self.button_settings.set_sensitive(False)
-
         # init show version
         self.show_versions = self.settings.get_boolean("show-versions")
         # init summary_before_name
         self.summary_before_name = self.settings.get_boolean(
             "summary-before-name")
 
-        # Create Unity launcher quicklist
-        # FIXME: instead of passing parent we really should just send signals
-        self.unity = UnitySupport(parent=self)
+        # expander
+        self.expander_details.set_expanded(
+            self.settings.get_boolean("show-details"))
+        self.expander_details.connect("activate", self.pre_activate_details)
+        self.expander_details.connect("notify::expanded",
+                                     self.activate_details)
+        self.expander_desc.connect("notify::expanded", self.activate_desc)
+
+        # If auto-updates are on, change cancel label
+        self.notifier_settings = Gio.Settings("com.ubuntu.update-notifier")
+        self.notifier_settings.connect(
+            "changed::auto-launch",
+            lambda s, p: self.update_close_button())
+        self.update_close_button()
 
         # Alert watcher
         self.alert_watcher = AlertWatcher()
@@ -357,6 +351,16 @@
         self.alert_watcher.connect("network-3g-alert",
                                    self._on_network_3g_alert)
 
+    def stop(self):
+        InternalDialog.stop(self)
+        self._save_state()
+
+    def start(self):
+        InternalDialog.start(self)
+        self.set_update_list(self.window_main.update_list)
+        self.alert_watcher.check_alert_state()
+        self._restore_state()
+
     def is_auto_update(self):
         update_days = apt_pkg.config.find_i(
             "APT::Periodic::Update-Package-Lists")
@@ -378,22 +382,25 @@
         self.on_button_install_clicked(None)
 
     def restart_icon_renderer_data_func(self, cell_layout, renderer, model,
-                                        iter, data):
+                                        iter, user_data):
         def pkg_requires_restart(pkg):
-            restart_condition = pkg.candidate.record.get('XB-Restart-Required')
+            if pkg is None or pkg.candidate is None:
+                return False
+            restart_condition = pkg.candidate.record.get(
+                'XB-Restart-Required')
             return restart_condition == 'system'
 
         data = model.get_value(iter, LIST_UPDATE_DATA)
         path = model.get_path(iter)
 
         requires_restart = False
-        if data.item:
+        if data.item and data.item.pkg:
             requires_restart = pkg_requires_restart(data.item.pkg)
         elif data.group:
             if not self.treeview_update.row_expanded(path):
                 # A package in the group requires restart
                 for group_item in data.group.items:
-                    if pkg_requires_restart(group_item.pkg):
+                    if group_item.pkg and pkg_requires_restart(group_item.pkg):
                         requires_restart = True
                         break
 
@@ -408,8 +415,8 @@
             gicon = None
         renderer.set_property("gicon", gicon)
 
-    def pkg_toggle_renderer_data_func(self, cell_layout, renderer, model, iter,
-                                      data):
+    def pkg_toggle_renderer_data_func(self, cell_layout, renderer, model,
+                                      iter, user_data):
         data = model.get_value(iter, LIST_UPDATE_DATA)
 
         activatable = False
@@ -439,8 +446,8 @@
         renderer.set_property("activatable", activatable)
         renderer.set_property("inconsistent", inconsistent)
 
-    def pkg_icon_renderer_data_func(self, cell_layout, renderer, model, iter,
-                                    data):
+    def pkg_icon_renderer_data_func(self, cell_layout, renderer, model,
+                                    iter, user_data):
         data = model.get_value(iter, LIST_UPDATE_DATA)
 
         gicon = None
@@ -466,8 +473,8 @@
         else:
             return icon  # Assume it's in one of the user's themes
 
-    def pkg_label_renderer_data_func(self, cell_layout, renderer, model, iter,
-                                     data):
+    def pkg_label_renderer_data_func(self, cell_layout, renderer, model,
+                                     iter, user_data):
         data = model.get_value(iter, LIST_UPDATE_DATA)
         name = GLib.markup_escape_text(model.get_value(iter, LIST_NAME))
 
@@ -742,6 +749,9 @@
 
         if self.custom_header is not None:
             text_header = self.custom_header
+        if self.custom_desc is not None:
+            text_desc = self.custom_desc
+
         # show different text on first run (UX team suggestion)
         elif self.settings.get_boolean("first-run"):
             flavor = self.window_main.meta_release.flavor_name
@@ -754,19 +764,10 @@
             text_header = _("Updated software is available for this "
                             "computer. Do you want to install it now?")
 
-        if self.custom_desc is not None:
-            text_desc = self.custom_desc
-
         self.notebook_details.set_sensitive(True)
         self.treeview_update.set_sensitive(True)
-        self.button_install.grab_default()
-        self.label_header.set_label(text_header)
-
-        if text_desc is not None:
-            self.label_desc.set_label(text_desc)
-            self.label_desc.show()
-        else:
-            self.label_desc.hide()
+        self.set_header(text_header)
+        self.set_desc(text_desc)
 
         return True
 
@@ -774,47 +775,20 @@
     def pre_activate_details(self, expander):
         expanded = self.expander_details.get_expanded()
         if expanded:
-            self.save_state()
+            self._save_state()
 
     def activate_details(self, expander, data):
         expanded = self.expander_details.get_expanded()
         self.settings.set_boolean("show-details", expanded)
         if expanded:
             self.on_treeview_update_cursor_changed(self.treeview_update)
-        self.restore_state()
+        self._restore_state()
 
     def activate_desc(self, expander, data):
         expanded = self.expander_desc.get_expanded()
         self.expander_desc.set_vexpand(expanded)
 
-    #def on_button_help_clicked(self, widget):
-    #  self.help_viewer.run()
-
-    def on_button_settings_clicked(self, widget):
-        #print("on_button_settings_clicked")
-        try:
-            apt_pkg.pkgsystem_unlock()
-        except SystemError:
-            pass
-        cmd = ["/usr/bin/software-properties-gtk",
-               "--open-tab", "2",
-               # FIXME: once get_xid() is available via introspections, add
-               #        this back
-               #"--toplevel", "%s" % self.window_main.get_window().get_xid()
-               ]
-        self.window_main.set_sensitive(False)
-        p = subprocess.Popen(cmd)
-        while p.poll() is None:
-            while Gtk.events_pending():
-                Gtk.main_iteration()
-            time.sleep(0.05)
-        apt_pkg.init_config()
-        self.window_main.refresh_cache()
-        self.fillstore()
-        self.update_close_button()
-        self.window_main.set_sensitive(True)
-
-    def on_button_install_clicked(self, widget):
+    def on_button_install_clicked(self):
         self.unity.set_install_menuitem_visible(False)
         #print("on_button_install_clicked")
         err_sum = _("Not enough free disk space")
@@ -930,24 +904,22 @@
         del actiongroup
         self.setBusy(False)
 
-    def save_state(self):
+    def _save_state(self):
         """ save the state  (window-size for now) """
         if self.expander_details.get_expanded():
             (w, h) = self.window_main.get_size()
             self.settings.set_int("window-width", w)
             self.settings.set_int("window-height", h)
 
-    def restore_state(self):
+    def _restore_state(self):
         """ restore the state (window-size for now) """
         w = self.settings.get_int("window-width")
         h = self.settings.get_int("window-height")
         expanded = self.expander_details.get_expanded()
-        self.window_main.set_resizable(expanded)
-        if w > 0 and h > 0 and expanded:
-            # There is a race here.  If we immediately resize, it often doesn't
-            # take.  Using idle_add helps, but we *still* occasionally don't
-            # restore the size correctly.  Help needed to track this down!
-            GLib.idle_add(lambda: self.window_main.resize(w, h))
+        if expanded:
+            self.window_main.begin_user_resizable(w, h)
+        else:
+            self.window_main.end_user_resizable()
         return False
 
     def _add_header(self, name, groups):
@@ -996,7 +968,9 @@
                 ]
                 self.store.append(group_iter, item_row)
 
-    def fillstore(self):
+    def set_update_list(self, update_list):
+        self.list = update_list
+
         # use the watch cursor
         self.setBusy(True)
         # disconnect the view first
@@ -1017,14 +991,11 @@
             self._add_groups(self.list.update_groups)
 
         self.treeview_update.set_model(self.store)
+        self.pkg_cell_area.indent_toplevel = bool(self.list.security_groups)
+        self.update_close_button()
         self.update_count()
         self.setBusy(False)
         while Gtk.events_pending():
             Gtk.main_iteration()
         self.updates_changed()
         return False
-
-    def main(self):
-        self.window_main.push(self.pane_updates_available, self)
-        self.fillstore()
-        self.alert_watcher.check_alert_state()

=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2013-02-06 21:12:16 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2013-05-21 05:43:25 +0000
@@ -24,20 +24,25 @@
 
 from UpdateManager.backend import InstallBackend
 from UpdateManager.UnitySupport import UnitySupport
+from UpdateManager.Dialogs import BuilderDialog
 
 from gettext import gettext as _
 
 import apt
 import dbus
-import sys
-
-
-class InstallBackendAptdaemon(InstallBackend):
-
+import os
+
+
+class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
     """Makes use of aptdaemon to refresh the cache and to install updates."""
 
-    def __init__(self, datadir, window_main):
-        InstallBackend.__init__(self, datadir, window_main)
+    def __init__(self, window_main, action):
+        InstallBackend.__init__(self, window_main, action)
+        ui_path = os.path.join(window_main.datadir,
+                               "gtkbuilder/UpdateProgress.ui")
+        BuilderDialog.__init__(self, window_main, ui_path,
+                               "pane_update_progress")
+
         self.client = client.AptClient()
         self.unity = UnitySupport()
         self._expanded_size = None
@@ -59,17 +64,20 @@
             pass
         try:
             trans = yield self.client.update_cache(defer=True)
-            yield self._run_in_dialog(trans, self.UPDATE,
-                                      _("Checking for updates…"),
-                                      False, False)
+            yield self._show_transaction(trans, self.ACTION_UPDATE,
+                                         _("Checking for updates…"),  False)
         except errors.NotAuthorizedError:
-            self.emit("action-done", self.UPDATE, False, False, None, None)
+            self._action_done(self.ACTION_UPDATE,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
         except:
-            self.emit("action-done", self.UPDATE, True, False, None, None)
+            self._action_done(self.ACTION_UPDATE,
+                              authorized=True, success=False,
+                              error_string=None, error_desc=None)
             raise
 
     @inline_callbacks
-    def commit(self, pkgs_install, pkgs_upgrade, close_on_done):
+    def commit(self, pkgs_install, pkgs_upgrade):
         """Commit a list of package adds and removes"""
         try:
             apt.apt_pkg.pkgsystem_unlock()
@@ -81,18 +89,23 @@
                 pkgs_install, reinstall, remove, purge, pkgs_upgrade,
                 downgrade, defer=True)
             trans.connect("progress-changed", self._on_progress_changed)
-            yield self._run_in_dialog(trans, self.INSTALL,
-                                      _("Installing updates…"),
-                                      True, close_on_done)
+            yield self._show_transaction(trans, self.ACTION_INSTALL,
+                                         _("Installing updates…"), True)
         except errors.NotAuthorizedError as e:
-            self.emit("action-done", self.INSTALL, False, False, None, None)
+            self._action_done(self.ACTION_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
         except dbus.DBusException as e:
             #print(e, e.get_dbus_name())
             if e.get_dbus_name() != "org.freedesktop.DBus.Error.NoReply":
                 raise
-            self.emit("action-done", self.INSTALL, False, False, None, None)
+            self._action_done(self.ACTION_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
         except Exception as e:
-            self.emit("action-done", self.INSTALL, True, False, None, None)
+            self._action_done(self.ACTION_INSTALL,
+                              authorized=True, success=False,
+                              error_string=None, error_desc=None)
             raise
 
     def _on_progress_changed(self, trans, progress):
@@ -111,28 +124,18 @@
             self._resize_to_show_details(expander)
 
     @inline_callbacks
-    def _run_in_dialog(self, trans, action, header, show_details,
-                       close_on_done):
-        builder = Gtk.Builder()
-        builder.set_translation_domain("update-manager")
-        builder.add_from_file(self.datadir + "/gtkbuilder/UpdateProgress.ui")
-
-        label_header = builder.get_object("label_header")
-        label_header.set_label(header)
+    def _show_transaction(self, trans, action, header, show_details):
+        self.label_header.set_label(header)
 
         progressbar = AptProgressBar(trans)
         progressbar.show()
-        progressbar_slot = builder.get_object("progressbar_slot")
-        progressbar_slot.add(progressbar)
+        self.progressbar_slot.add(progressbar)
 
         self.button_cancel = AptCancelButton(trans)
-        if action == self.UPDATE:
+        if action == self.ACTION_UPDATE:
             self.button_cancel.set_label(Gtk.STOCK_STOP)
         self.button_cancel.show()
-        button_cancel_slot = builder.get_object("button_cancel_slot")
-        button_cancel_slot.add(self.button_cancel)
-
-        label_details = builder.get_object("label_details")
+        self.button_cancel_slot.add(self.button_cancel)
 
         if show_details:
             expander = AptDetailsExpander(trans)
@@ -140,39 +143,30 @@
             expander.set_hexpand(True)
             expander.show_all()
             expander.connect("notify::expanded", self._on_expanded)
-            expander_slot = builder.get_object("expander_slot")
-            expander_slot.add(expander)
-            expander_slot.show()
+            self.expander_slot.add(expander)
+            self.expander_slot.show()
         else:
             expander = None
 
         trans.connect("status-details-changed", self._on_details_changed,
-                      label_details)
-        trans.connect("status-changed", self._on_status_changed, label_details,
+                      self.label_details)
+        trans.connect("status-changed", self._on_status_changed, self.label_details,
                       expander)
-        trans.connect("finished", self._on_finished, action, close_on_done)
+        trans.connect("finished", self._on_finished, action)
         trans.connect("medium-required", self._on_medium_required)
         trans.connect("config-file-conflict", self._on_config_file_conflict)
 
         yield trans.set_debconf_frontend("gnome")
         yield trans.run()
 
-        self.window_main.push(builder.get_object("pane_update_progress"),
-                              self)
-
-        self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE |
-                                                    Gdk.WMFunction.RESIZE |
-                                                    Gdk.WMFunction.MINIMIZE)
-
     def _on_expanded(self, expander, param):
         # Make the dialog resizable if the expander is expanded
         # try to restore a previous size
         if not expander.get_expanded():
             self._expanded_size = (expander.terminal.get_visible(),
                                    self.window_main.get_size())
-            self.window_main.set_resizable(False)
+            self.window_main.end_user_resizable()
         elif self._expanded_size:
-            self.window_main.set_resizable(True)
             term_visible, (stored_width, stored_height) = self._expanded_size
             # Check if the stored size was for the download details or
             # the terminal widget
@@ -181,9 +175,8 @@
                 # get a new size for the terminal widget
                 self._resize_to_show_details(expander)
             else:
-                self.window_main.resize(stored_width, stored_height)
+                self.window_main.begin_user_resizable(stored_width, stored_height)
         else:
-            self.window_main.set_resizable(True)
             self._resize_to_show_details(expander)
 
     def _resize_to_show_details(self, expander):
@@ -195,16 +188,19 @@
         If the expander is expanded afterwards the window won't change its
         size anymore. So we have to do this manually. See LP#840942
         """
-        win_width, win_height = self.window_main.get_size()
-        exp_width = expander.get_allocation().width
-        exp_height = expander.get_allocation().height
-        if expander.terminal.get_visible():
-            terminal_width = expander.terminal.get_char_width() * 80
-            terminal_height = expander.terminal.get_char_height() * 24
-            self.window_main.resize(terminal_width - exp_width + win_width,
-                                    terminal_height - exp_height + win_height)
-        else:
-            self.window_main.resize(win_width + 100, win_height + 200)
+        if expander.get_expanded():
+            win_width, win_height = self.window_main.get_size()
+            exp_width = expander.get_allocation().width
+            exp_height = expander.get_allocation().height
+            if expander.terminal.get_visible():
+                terminal_width = expander.terminal.get_char_width() * 80
+                terminal_height = expander.terminal.get_char_height() * 24
+                new_width = terminal_width - exp_width + win_width
+                new_height = terminal_height - exp_height + win_height
+            else:
+                new_width = win_width + 100
+                new_height = win_height + 200
+            self.window_main.begin_user_resizable(new_width, new_height)
 
     def _on_medium_required(self, transaction, medium, drive):
         dialog = AptMediumRequiredDialog(medium, drive, self.window_main)
@@ -224,18 +220,19 @@
         else:
             transaction.resolve_config_file_conflict(old, "keep")
 
-    def _on_finished(self, trans, status, action, close_on_done):
+    def _on_finished(self, trans, status, action):
         error_string = None
         error_desc = None
         if status == EXIT_FAILED:
             error_string = get_error_string_from_enum(trans.error.code)
             error_desc = get_error_description_from_enum(trans.error.code)
-        elif status == EXIT_SUCCESS and close_on_done:
-            sys.exit(0)
         # tell unity to hide the progress again
         self.unity.set_progress(-1)
-        self.emit("action-done", action, True, status == EXIT_SUCCESS,
-                  error_string, error_desc)
+        is_success = (status == EXIT_SUCCESS)
+        self._action_done(action,
+                          authorized=True, success=is_success,
+                          error_string=error_string, error_desc=error_desc)
+
 
 if __name__ == "__main__":
     b = InstallBackendAptdaemon(None)

=== modified file 'UpdateManager/backend/InstallBackendSynaptic.py'
--- UpdateManager/backend/InstallBackendSynaptic.py	2012-12-13 20:39:37 +0000
+++ UpdateManager/backend/InstallBackendSynaptic.py	2013-05-21 05:43:25 +0000
@@ -8,13 +8,43 @@
 from gettext import gettext as _
 
 from gi.repository import GObject
+# Extra GdkX11 import for pygobject bug #673396
+# https://bugzilla.gnome.org/show_bug.cgi?id=673396
+from gi.repository import GdkX11
 
 from UpdateManager.backend import InstallBackend
+from UpdateManager.Dialogs import Dialog
 
 
 class InstallBackendSynaptic(InstallBackend):
     """ Install backend based on synaptic """
 
+    def update(self):
+        opt = ["--update-at-startup"]
+        tempf = None
+        self._run_synaptic(self.ACTION_UPDATE, opt, tempf)
+
+    def commit(self, pkgs_install, pkgs_upgrade, close_on_done=False):
+        # close when update was successful (its ok to use a Synaptic::
+        # option here, it will not get auto-saved, because synaptic does
+        # not save options in non-interactive mode)
+        opt = []
+        if close_on_done:
+            opt.append("-o")
+            opt.append("Synaptic::closeZvt=true")
+        # custom progress strings
+        opt.append("--progress-str")
+        opt.append("%s" % _("Please wait, this can take some time."))
+        opt.append("--finish-str")
+        opt.append("%s" % _("Update is complete"))
+        tempf = tempfile.NamedTemporaryFile(mode="w+")
+        for pkg_name in pkgs_install + pkgs_upgrade:
+            tempf.write("%s\tinstall\n" % pkg_name)
+        opt.append("--set-selections-file")
+        opt.append("%s" % tempf.name)
+        tempf.flush()
+        self._run_synaptic(self.ACTION_INSTALL, opt, tempf)
+
     def _run_synaptic(self, action, opt, tempf):
         """Execute synaptic."""
         try:
@@ -42,31 +72,7 @@
         action, tempf = data
         if tempf:
             tempf.close()
-        self.emit("action-done", action, True, os.WEXITSTATUS(condition) == 0,
-                  None, None)
-
-    def update(self):
-        opt = ["--update-at-startup"]
-        tempf = None
-        self._run_synaptic(self.UPDATE, opt, tempf)
-
-    def commit(self, pkgs_install, pkgs_upgrade, close_on_done):
-        # close when update was successful (its ok to use a Synaptic::
-        # option here, it will not get auto-saved, because synaptic does
-        # not save options in non-interactive mode)
-        opt = []
-        if close_on_done:
-            opt.append("-o")
-            opt.append("Synaptic::closeZvt=true")
-        # custom progress strings
-        opt.append("--progress-str")
-        opt.append("%s" % _("Please wait, this can take some time."))
-        opt.append("--finish-str")
-        opt.append("%s" % _("Update is complete"))
-        tempf = tempfile.NamedTemporaryFile(mode="w+")
-        for pkg_name in pkgs_install + pkgs_upgrade:
-            tempf.write("%s\tinstall\n" % pkg_name)
-        opt.append("--set-selections-file")
-        opt.append("%s" % tempf.name)
-        tempf.flush()
-        self._run_synaptic(self.INSTALL, opt, tempf)
+        self._action_done(action,
+                          authorized=True,
+                          success=os.WEXITSTATUS(condition) == 0,
+                          error_string=None, error_desc=None)

=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2012-12-13 20:39:37 +0000
+++ UpdateManager/backend/__init__.py	2013-05-21 05:43:25 +0000
@@ -7,41 +7,79 @@
 from __future__ import absolute_import
 
 import os
+import sys
 
 from gi.repository import GObject
-
-
-class InstallBackend(GObject.GObject):
-    """The abstract backend that can install/remove packages"""
-
-    __gsignals__ = {"action-done": (GObject.SignalFlags.RUN_FIRST,
-                                    None,
-                                    (GObject.TYPE_INT,      # action id
-                                     GObject.TYPE_BOOLEAN,  # authorized
-                                     GObject.TYPE_BOOLEAN,  # success
-                                     GObject.TYPE_STRING,   # error string
-                                     GObject.TYPE_STRING)   # error desc
-                                    ),
-                    }
-
-    (INSTALL, UPDATE) = range(2)
-
-    def __init__(self, datadir, window_main):
-        """init backend
-        takes a gtk main window as parameter
-        """
-        GObject.GObject.__init__(self)
-        self.datadir = datadir
-        self.window_main = window_main
-
-    def commit(self, pkgs_install, pkgs_upgrade, close_on_done):
-        """Commit the cache changes """
-        raise NotImplemented
+from UpdateManager.Core.utils import (inhibit_sleep,
+                         allow_sleep)
+from UpdateManager.Dialogs import Dialog
+
+
+class InstallBackend(Dialog):
+    ACTION_UPDATE = 0
+    ACTION_INSTALL = 1
+
+    def __init__(self, window_main, action):
+        Dialog.__init__(self, window_main)
+        self.action = action
+        self.sleep_cookie = None
+        self.sleep_dev = None
+
+    def start(self):
+        os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
+
+        # Do not suspend during the update process
+        (self.sleep_dev, self.sleep_cookie) = inhibit_sleep()
+
+        if self.action == self.ACTION_INSTALL:
+            # Get the packages which should be installed and update
+            pkgs_install = []
+            pkgs_upgrade = []
+            for pkg in self.window_main.cache:
+                if pkg.marked_install:
+                    pkgs_install.append(pkg.name)
+                elif pkg.marked_upgrade:
+                    pkgs_upgrade.append(pkg.name)
+            self.commit(pkgs_install, pkgs_upgrade)
+        else:
+            self.update()
 
     def update(self):
         """Run a update to refresh the package list"""
         raise NotImplemented
 
+    def commit(self, pkgs_install, pkgs_upgrade):
+        """Commit the cache changes """
+        raise NotImplemented
+
+    def _action_done(self, action, authorized, success, error_string,
+                     error_desc):
+        # Allow suspend after update is finished
+        if self.sleep_cookie:
+            allow_sleep(self.sleep_dev, self.sleep_cookie)
+            self.sleep_cookie = self.sleep_dev = None
+
+        # If the progress dialog should be closed automatically afterwards
+        #settings = Gio.Settings("com.ubuntu.update-manager")
+        #close_after_install = settings.get_boolean(
+        #    "autoclose-install-window")
+        # FIXME: confirm with mpt whether this should still be a setting
+        close_after_install = False
+
+        if action == self.ACTION_INSTALL:
+            if success:
+                self.window_main.start_available()
+            elif error_string:
+                self.window_main.start_error(False, error_string, error_desc)
+            else:
+                self.window_main.exit()
+        else:
+            if error_string:
+                self.window_main.start_error(True, error_string, error_desc)
+            else:
+                is_cancelled_update = not success
+                self.window_main.start_available(is_cancelled_update)
+
 
 def get_backend(*args, **kwargs):
     """Select and return a package manager backend."""

=== modified file 'data/gtkbuilder/Dialog.ui'
--- data/gtkbuilder/Dialog.ui	2013-01-25 16:41:01 +0000
+++ data/gtkbuilder/Dialog.ui	2013-05-21 05:43:25 +0000
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkDialog" id="window_dialog">
+  <object class="GtkWindow" id="window_dialog">
     <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
+    <child>
+      <object class="GtkBox" id="pane_dialog">
+        <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="border_width">12</property>
         <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
-          <object class="GtkGrid" id="pane_dialog">
+          <object class="GtkGrid" id="header_grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_bottom">12</property>
             <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="border_width">12</property>
-            <property name="row_spacing">12</property>
+            <property name="row_spacing">2</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkImage" id="image_logo">
@@ -44,23 +31,21 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="height">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label_header">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
                 <property name="margin_top">6</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="wrap">True</property>
-                <property name="width_chars">20</property>
                 <property name="max_width_chars">20</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
-                  <attribute name="scale" value="1.25"/>
                 </attributes>
               </object>
               <packing>
@@ -75,7 +60,6 @@
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
                 <property name="wrap">True</property>
@@ -88,37 +72,52 @@
                 <property name="height">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButtonBox" id="buttonbox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">end</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="spacing">6</property>
-                <property name="homogeneous">True</property>
-                <property name="layout_style">end</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="main_container">
+            <property name="can_focus">False</property>
+            <property name="no_show_all">True</property>
+            <property name="margin_bottom">12</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <placeholder/>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="padding">4</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkButtonBox" id="buttonbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">end</property>
+            <property name="hexpand">True</property>
+            <property name="spacing">6</property>
+            <property name="homogeneous">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

=== modified file 'data/gtkbuilder/UpdateManager.ui'
--- data/gtkbuilder/UpdateManager.ui	2012-12-18 02:30:27 +0000
+++ data/gtkbuilder/UpdateManager.ui	2013-05-21 05:43:25 +0000
@@ -1,533 +1,365 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkImage" id="image-apply">
+  <object class="GtkVBox" id="pane_updates_available">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-apply</property>
-  </object>
-  <object class="GtkWindow" id="window_updates_available">
-    <property name="can_focus">False</property>
+    <property name="spacing">12</property>
     <child>
-      <object class="GtkVBox" id="pane_updates_available">
+      <object class="GtkExpander" id="expander_details">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
+        <property name="can_focus">True</property>
         <property name="spacing">6</property>
+        <property name="resize_toplevel">True</property>
         <child>
-          <object class="GtkVBox" id="vbox_updates">
+          <object class="GtkVBox" id="vbox4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="spacing">12</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkHBox" id="hbox3">
+              <object class="GtkScrolledWindow" id="scrolledwindow_update">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkImage" id="image_logo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="pixel_size">48</property>
-                    <property name="icon_name">system-software-update</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_bottom">6</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label_header">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="wrap">True</property>
-                        <property name="max_width_chars">20</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1.25"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_desc">
-                        <property name="can_focus">False</property>
-                        <property name="no_show_all">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="wrap">True</property>
-                        <property name="max_width_chars">20</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">100</property>
+                <child>
+                  <object class="GtkTreeView" id="treeview_update">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                    <property name="rules_hint">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="treeview_update-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes">updates</property>
+                      </object>
+                    </child>
+                    <signal name="cursor-changed" handler="on_treeview_update_cursor_changed" swapped="no"/>
+                    <signal name="row-activated" handler="on_treeview_update_row_activated" swapped="no"/>
+                  </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkExpander" id="expander_details">
+              <object class="GtkExpander" id="expander_desc">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="spacing">6</property>
-                <property name="resize_toplevel">True</property>
                 <child>
-                  <object class="GtkVBox" id="vbox4">
+                  <object class="GtkNotebook" id="notebook_details">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow_update">
+                    <property name="can_focus">True</property>
+                    <property name="show_border">False</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="border_width">6</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkScrolledWindow" id="scrolledwindow_changes">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Changes</property>
+                      </object>
+                      <packing>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="border_width">6</property>
                         <property name="shadow_type">in</property>
-                        <property name="min_content_height">100</property>
                         <child>
-                          <object class="GtkTreeView" id="treeview_update">
+                          <object class="GtkTextView" id="textview_descr">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="headers_visible">False</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="rules_hint">True</property>
+                            <property name="pixels_above_lines">6</property>
+                            <property name="editable">False</property>
+                            <property name="wrap_mode">word</property>
+                            <property name="left_margin">6</property>
+                            <property name="right_margin">6</property>
+                            <property name="cursor_visible">False</property>
+                            <property name="accepts_tab">False</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="treeview_update-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">updates</property>
+                              <object class="AtkObject" id="textview_descr-atkobject">
+                                <property name="AtkObject::accessible-name" translatable="yes">Description</property>
                               </object>
                             </child>
-                            <signal name="cursor-changed" handler="on_treeview_update_cursor_changed" swapped="no"/>
-                            <signal name="row-activated" handler="on_treeview_update_row_activated" swapped="no"/>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection"/>
-                            </child>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkExpander" id="expander_desc">
+                    <child type="tab">
+                      <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <child>
-                          <object class="GtkNotebook" id="notebook_details">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="show_border">False</property>
-                            <child>
-                              <object class="GtkVBox" id="vbox5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="border_width">6</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow_changes">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="tab">
-                              <object class="GtkLabel" id="label8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Changes</property>
-                              </object>
-                              <packing>
-                                <property name="tab_fill">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="border_width">6</property>
-                                <property name="shadow_type">in</property>
-                                <child>
-                                  <object class="GtkTextView" id="textview_descr">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="pixels_above_lines">6</property>
-                                    <property name="editable">False</property>
-                                    <property name="wrap_mode">word</property>
-                                    <property name="left_margin">6</property>
-                                    <property name="right_margin">6</property>
-                                    <property name="cursor_visible">False</property>
-                                    <property name="accepts_tab">False</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="textview_descr-atkobject">
-                                        <property name="AtkObject::accessible-name" translatable="yes">Description</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child type="tab">
-                              <object class="GtkLabel" id="label9">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Description</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="label9-atkobject">
-                                    <property name="AtkObject::accessible-name" translatable="yes">Description</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                                <property name="tab_fill">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Technical description</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Description</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="label9-atkobject">
+                            <property name="AtkObject::accessible-name" translatable="yes">Description</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
+                        <property name="tab_fill">False</property>
                       </packing>
                     </child>
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkLabel" id="label12">
+                  <object class="GtkLabel" id="label13">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Details of updates</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Technical description</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox_alerts">
-                <property name="can_focus">False</property>
-                <property name="spacing">3</property>
-                <child>
-                  <object class="GtkHBox" id="hbox_downsize">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkImage" id="image_downsize">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">aptdaemon-download</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_downsize">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label">
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label12">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Details of updates</property>
+            <property name="use_markup">True</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox_alerts">
+        <property name="can_focus">False</property>
+        <property name="spacing">3</property>
+        <child>
+          <object class="GtkHBox" id="hbox_downsize">
+            <property name="can_focus">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image_downsize">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">aptdaemon-download</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_downsize">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label">
 </property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox_roaming">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkImage" id="image_roaming">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">dialog-warning</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_roaming">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">You are connected via roaming and may be charged for the data consumed by this update.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox_on_3g">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkImage" id="image_on_3g">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">modem</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_on_3g">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">You may want to wait until you’re not using a mobile broadband connection.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox_battery">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkImage" id="image_battery">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">battery</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_battery">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">It’s safer to connect the computer to AC power before updating.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox_offline">
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkImage" id="image_offline">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">network-offline</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_offline">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
+                <property name="wrap">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkHButtonBox" id="hbuttonbox6">
-            <property name="visible">True</property>
+          <object class="GtkHBox" id="hbox_roaming">
             <property name="can_focus">False</property>
-            <property name="border_width">5</property>
-            <property name="spacing">6</property>
-            <property name="layout_style">end</property>
+            <property name="spacing">12</property>
             <child>
-              <object class="GtkButton" id="button_settings">
-                <property name="label" translatable="yes">_Settings...</property>
+              <object class="GtkImage" id="image_roaming">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_button_settings_clicked" swapped="no"/>
+                <property name="can_focus">False</property>
+                <property name="icon_name">dialog-warning</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_close">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <accelerator key="W" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-                <accelerator key="Q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_install">
-                <property name="label" translatable="yes">_Install Now</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">image-apply</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_button_install_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_roaming">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">You are connected via roaming and may be charged for the data consumed by this update.</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkHBox" id="hbox_on_3g">
+            <property name="can_focus">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image_on_3g">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">modem</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_on_3g">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">You may want to wait until you’re not using a mobile broadband connection.</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_battery">
+            <property name="can_focus">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image_battery">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">battery</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_battery">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">It’s safer to connect the computer to AC power before updating.</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox_offline">
+            <property name="can_focus">False</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image_offline">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">network-offline</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_offline">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
     </child>
   </object>
 </interface>

=== modified file 'debian/update-manager.install'
--- debian/update-manager.install	2012-11-19 16:33:28 +0000
+++ debian/update-manager.install	2013-05-21 05:43:25 +0000
@@ -8,10 +8,7 @@
 debian/tmp/usr/share/applications/update-manager.desktop
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/ChangelogViewer.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/Dialogs.py
-debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/InstallProgress.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/MetaReleaseGObject.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdateManager.py
-debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdateProgress.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdatesAvailable.py
-debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/SimpleGtkbuilderApp.py
 debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/HelpViewer.py

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-09-25 07:36:24 +0000
+++ po/POTFILES.in	2013-05-21 05:43:25 +0000
@@ -4,9 +4,7 @@
 UpdateManager/ChangelogViewer.py
 UpdateManager/MetaReleaseGObject.py
 UpdateManager/Dialogs.py
-UpdateManager/InstallProgress.py
 UpdateManager/UpdateManager.py
-UpdateManager/UpdateProgress.py
 UpdateManager/UpdatesAvailable.py
 UpdateManager/UnitySupport.py
 UpdateManagerText/UpdateManagerText.py

=== modified file 'po/update-manager.pot'
--- po/update-manager.pot	2012-06-25 16:25:51 +0000
+++ po/update-manager.pot	2013-05-21 05:43:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-25 12:22-0400\n"
+"POT-Creation-Date: 2013-05-20 10:14-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,176 +18,235 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendAptdaemon.py:68
+msgid "Checking for updates…"
+msgstr ""
+
+#: ../UpdateManager/backend/InstallBackendAptdaemon.py:93
+msgid "Installing updates…"
+msgstr ""
+
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:37
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:39
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
-msgid "Could not find the release notes"
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
-msgid "The server may be overloaded. "
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
-msgid "Could not download the release notes"
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
-msgid "Please check your internet connection."
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
-msgid "Upgrade"
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
-#: ../data/gtkbuilder/UpdateManager.ui.h:15
-msgid "Release Notes"
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
-msgid "Downloading additional package files..."
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#, python-format
-msgid "File %s of %s at %sB/s"
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
-#, python-format
-msgid "File %s of %s"
-msgstr ""
-
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
-#, python-format
-msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
-
-#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
-msgid "Media Change"
-msgstr ""
-
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:79
 msgid "Open Link in Browser"
 msgstr ""
 
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:83
 msgid "Copy Link to Clipboard"
 msgstr ""
 
-#: ../UpdateManager/GtkProgress.py:162
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../UpdateManager/GtkProgress.py:167
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:100
-msgid "Your Ubuntu release is not supported anymore."
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:101
-msgid ""
-"You will not get any further security fixes or critical updates. Please "
-"upgrade to a later version of Ubuntu."
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:109
-msgid "Upgrade information"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:204
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/Dialogs.py:120
+msgid "Settings…"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:148 ../UpdateManager/UpdateManager.py:244
+msgid "You stopped the check for updates."
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:150
+msgid "_Check Again"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:161
+msgid "No software updates are available."
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:163 ../UpdateManager/Dialogs.py:172
+msgid "The software on this computer is up to date."
+msgstr ""
+
+#. Translators: these are Ubuntu version names like "Ubuntu 12.04"
+#: ../UpdateManager/Dialogs.py:174
+#, python-format
+msgid "However, %s %s is now available (you have %s)."
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:179
+msgid "Upgrade…"
+msgstr ""
+
+#. Translators: this is an Ubuntu version name like "Ubuntu 12.04"
+#: ../UpdateManager/Dialogs.py:201
+#, python-format
+msgid "Software updates are no longer provided for %s %s."
+msgstr ""
+
+#. Translators: this is an Ubuntu version name like "Ubuntu 12.04"
+#: ../UpdateManager/Dialogs.py:205
+#, python-format
+msgid "To stay secure, you should upgrade to %s %s."
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:218
+msgid "Not all updates can be installed"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:220
+msgid ""
+"Run a partial upgrade, to install as many updates as possible.\n"
+"\n"
+"    This can be caused by:\n"
+"     * A previous upgrade which didn't complete\n"
+"     * Problems with some of the installed software\n"
+"     * Unofficial software packages not provided by Ubuntu\n"
+"     * Normal changes of a pre-release version of Ubuntu"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:228
+msgid "_Partial Upgrade"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:229
+msgid "_Continue"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:265
+msgid "_Try Again"
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:279
+msgid "The computer needs to restart to finish installing updates."
+msgstr ""
+
+#: ../UpdateManager/Dialogs.py:280
+msgid "_Restart"
+msgstr ""
+
+#. Basic GTK+ parameters
+#: ../UpdateManager/UpdateManager.py:85 ../data/update-manager.desktop.in.h:1
+msgid "Software Updater"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Some software couldn’t be checked for updates."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:245
+msgid "Updated software is available from a previous check."
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:323
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:324
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:330
+msgid "Could not initialize the package information"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:331
+msgid ""
+"An unresolvable problem occurred while initializing the package "
+"information.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"following error message:\n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:348
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:349
+msgid ""
+"An unresolvable problem occurred while calculating the upgrade.\n"
+"\n"
+"Please report this bug against the 'update-manager' package and include the "
+"following error message:\n"
+msgstr ""
+
+#: ../UpdateManager/UpdatesAvailable.py:248
+msgid "Install Now"
+msgstr ""
+
+#: ../UpdateManager/UpdatesAvailable.py:278
+#: ../UpdateManagerText/UpdateManagerText.py:36
 msgid "Install"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:206
-msgid "Name"
+#: ../UpdateManager/UpdatesAvailable.py:312
+msgid "Download"
+msgstr ""
+
+#: ../UpdateManager/UpdatesAvailable.py:372
+msgid "_Remind Me Later"
 msgstr ""
 
 #. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:359
+#: ../UpdateManager/UpdatesAvailable.py:506
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:417
+#: ../UpdateManager/UpdatesAvailable.py:569
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:427
+#: ../UpdateManager/UpdatesAvailable.py:579
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:471
+#: ../UpdateManager/UpdatesAvailable.py:623
 msgid "_Deselect All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:477
+#: ../UpdateManager/UpdatesAvailable.py:629
 msgid "Select _All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:536
+#: ../UpdateManager/UpdatesAvailable.py:704
 #, python-format
 msgid "%s will be downloaded."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdatesAvailable.py:718
 msgid "The update has already been downloaded."
 msgid_plural "The updates have already been downloaded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:553
+#: ../UpdateManager/UpdatesAvailable.py:724
 msgid "There are no updates to install."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:562
+#: ../UpdateManager/UpdatesAvailable.py:733
 msgid "Unknown download size."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:577
-msgid "The software on this computer is up to date."
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdatesAvailable.py:759
 #, python-format
 msgid ""
-"Updated software has been issued since %s was released. Do you want to "
+"Updated software has been issued since %s %s was released. Do you want to "
 "install it now?"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:594
+#: ../UpdateManager/UpdatesAvailable.py:764
 msgid ""
 "Updated software is available for this computer. Do you want to install it "
 "now?"
 msgstr ""
 
 #. print("on_button_install_clicked")
-#: ../UpdateManager/UpdateManager.py:645
+#: ../UpdateManager/UpdatesAvailable.py:794
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:646
+#: ../UpdateManager/UpdatesAvailable.py:795
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -195,125 +254,46 @@
 "temporary packages of former installations using 'sudo apt-get clean'."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:671
-msgid ""
-"The computer needs to restart to finish installing updates. Please save your "
-"work before continuing."
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:728
-msgid "Reading package information"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:743
+#: ../UpdateManager/UpdatesAvailable.py:821
 msgid "Connecting..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdatesAvailable.py:837
 msgid "You may not be able to check for updates or download new updates."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:880
-msgid "Could not initialize the package information"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:881
-msgid ""
-"An unresolvable problem occurred while initializing the package "
-"information.\n"
-"\n"
-"Please report this bug against the 'update-manager' package and include the "
-"following error message:\n"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:905
-msgid "Could not calculate the upgrade"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:906
-msgid ""
-"An unresolvable problem occurred while calculating the upgrade.\n"
-"\n"
-"Please report this bug against the 'update-manager' package and include the "
-"following error message:"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:930
-msgid " (New install)"
-msgstr ""
-
-#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:937
-#, python-format
-msgid "(Size: %s)"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:941
-#, python-format
-msgid "From version %(old_version)s to %(new_version)s"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:945
-#, python-format
-msgid "Version %s"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:978
-msgid "Release upgrade not possible right now"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:979
-#, python-format
-msgid ""
-"The release upgrade can not be performed currently, please try again later. "
-"The server reported: '%s'"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:981
-msgid "Downloading the release upgrade tool"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:988
-#, python-format
-msgid "<b>New Ubuntu release '%s' is available</b>"
-msgstr ""
-
-#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1027
-msgid "Software index is broken"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:1028
-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 ""
-
-#: ../UpdateManager/UnitySupport.py:57
+#: ../UpdateManager/UpdatesAvailable.py:986
+msgid "Security updates"
+msgstr ""
+
+#: ../UpdateManager/UpdatesAvailable.py:989
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UnitySupport.py:67
 msgid "Install All Available Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:34
+#: ../UpdateManagerText/UpdateManagerText.py:35
 msgid "Cancel"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:37
+#: ../UpdateManagerText/UpdateManagerText.py:38
 msgid "Changelog"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:41
 msgid "Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:54
 msgid "Building Updates List"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:57
 msgid ""
 "\n"
-"A normal upgrade can not be calculated, please run: \n"
+"A normal upgrade can not be calculated, please run:\n"
 "  sudo apt-get dist-upgrade\n"
 "\n"
 "\n"
@@ -324,35 +304,30 @@
 " * Normal changes of a pre-release version of Ubuntu"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:127
 msgid "Downloading changelog"
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:147
-#, python-format
-msgid "Other updates (%s)"
-msgstr ""
-
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:333
 msgid "This update does not come from a source that supports changelogs."
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:339 ../UpdateManager/Core/MyCache.py:376
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:346
 #, python-format
 msgid ""
-"Changes for the versions:\n"
+"Changes for %s versions:\n"
 "Installed version: %s\n"
 "Available version: %s\n"
 "\n"
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:362
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -361,7 +336,7 @@
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:369
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -370,124 +345,15 @@
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../UpdateManager/Core/UpdateList.py:51
-msgid "Failed to detect distribution"
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:52
-#, python-format
-msgid "A error '%s' occurred while checking what system you are using."
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:63
-msgid "Important security updates"
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:64
-msgid "Recommended updates"
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:65
-msgid "Proposed updates"
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:66
-msgid "Backports"
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:67
-msgid "Distribution updates"
-msgstr ""
-
-#: ../UpdateManager/Core/UpdateList.py:72
-msgid "Other updates"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
-#, python-format
-msgid "authenticate '%(file)s' against '%(signature)s' "
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
-#, python-format
-msgid "extracting '%s'"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
-msgid "Could not run the upgrade tool"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
-msgid ""
-"This is most likely a bug in the upgrade tool. Please report it as a bug "
-"using the command 'ubuntu-bug update-manager'."
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
-msgid "Upgrade tool signature"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
-msgid "Upgrade tool"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
-msgid "Failed to fetch"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
-msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
-msgid "Authentication failed"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
-msgid ""
-"Authenticating the upgrade failed. There may be a problem with the network "
-"or with the server. "
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
-msgid "Failed to extract"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
-msgid ""
-"Extracting the upgrade failed. There may be a problem with the network or "
-"with the server. "
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
-msgid "Verification failed"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
-msgid ""
-"Verifying the upgrade failed.  There may be a problem with the network or "
-"with the server. "
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
-msgid "Can not run the upgrade"
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
-msgid ""
-"This usually is caused by a system where /tmp is mounted noexec. Please "
-"remount without noexec and run the upgrade again."
-msgstr ""
-
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
-#, python-format
-msgid "The error message is '%s'."
+#. Translators: the %s is a distro name, like 'Ubuntu' and 'base' as in
+#. the core components and packages.
+#: ../UpdateManager/Core/UpdateList.py:167
+#, python-format
+msgid "%s base"
 msgstr ""
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../UpdateManager/Core/utils.py:433
+#: ../UpdateManager/Core/utils.py:485
 #, python-format
 msgid "%(size).0f kB"
 msgid_plural "%(size).0f kB"
@@ -495,112 +361,46 @@
 msgstr[1] ""
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/Core/utils.py:436
+#: ../UpdateManager/Core/utils.py:489
 #, python-format
 msgid "%.1f MB"
 msgstr ""
 
 #: ../data/gtkbuilder/UpdateManager.ui.h:1
-msgid "<big><b>Starting Software Updater</b></big>"
+msgid "updates"
 msgstr ""
 
 #: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
+msgid "Changes"
 msgstr ""
 
 #: ../data/gtkbuilder/UpdateManager.ui.h:3
-msgid "_Partial Upgrade"
+msgid "Description"
 msgstr ""
 
 #: ../data/gtkbuilder/UpdateManager.ui.h:4
-msgid "<big><b>Not all updates can be installed</b></big>"
+msgid "Technical description"
 msgstr ""
 
 #: ../data/gtkbuilder/UpdateManager.ui.h:5
-msgid ""
-"Run a partial upgrade, to install as many updates as possible. \n"
-"\n"
-"This can be caused by:\n"
-" * A previous upgrade which didn't complete\n"
-" * Problems with some of the installed software\n"
-" * Unofficial software packages not provided by Ubuntu\n"
-" * Normal changes of a pre-release version of Ubuntu"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:12
-msgid "Co_ntinue"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:13
-msgid "<big><b>Running on battery</b></big>"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:14
-msgid "Your system is running on battery. Are you sure you want to continue?"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:16
-msgid "_Upgrade"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:17
-msgid "Show progress of individual files"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:18
-#: ../data/update-manager.desktop.in.h:1
-msgid "Software Updater"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:19
-msgid "U_pgrade"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:20
-msgid "_Restart Now"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:21
-msgid "updates"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:22
-msgid "Changes"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:23
-msgid "Description"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:24
 msgid "Details of updates"
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:25
+#: ../data/gtkbuilder/UpdateManager.ui.h:6
 msgid ""
 "You are connected via roaming and may be charged for the data consumed by "
 "this update."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../data/gtkbuilder/UpdateManager.ui.h:7
 msgid ""
 "You may want to wait until you’re not using a mobile broadband connection."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
+#: ../data/gtkbuilder/UpdateManager.ui.h:8
 msgid "It’s safer to connect the computer to AC power before updating."
 msgstr ""
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "_Settings..."
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "_Install Now"
-msgstr ""
-
 #: ../data/update-manager.desktop.in.h:2
 msgid "Software Updates"
 msgstr ""
@@ -609,46 +409,38 @@
 msgid "Show and install available updates"
 msgstr ""
 
-#: ../update-manager:71 ../update-manager-text:55
+#: ../update-manager:70 ../update-manager-text:55
 msgid "Show version and exit"
 msgstr ""
 
-#: ../update-manager:74
+#: ../update-manager:73
 msgid "Directory that contains the data files"
 msgstr ""
 
-#: ../update-manager:77
+#: ../update-manager:76
 msgid "Check if a new Ubuntu release is available"
 msgstr ""
 
-#: ../update-manager:80
+#: ../update-manager:79
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr ""
 
-#: ../update-manager:84
+#: ../update-manager:83
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr ""
 
-#: ../update-manager:91
+#: ../update-manager:90
 msgid "Do not focus on map when starting"
 msgstr ""
 
-#: ../update-manager:94
-msgid "Try to run a dist-upgrade"
+#: ../update-manager:93
+msgid "Do not check for updates when starting"
 msgstr ""
 
 #: ../update-manager:97
-msgid "Do not check for updates when starting"
-msgstr ""
-
-#: ../update-manager:101
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr ""
 
-#: ../update-manager:121
-msgid "Running partial upgrade"
-msgstr ""
-
 #: ../update-manager-text:59
 msgid "Show description of the package instead of the changelog"
 msgstr ""
@@ -713,7 +505,7 @@
 
 #. Why do we use %s here instead of $strings or {} format placeholders?
 #. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../janitor/plugincore/exceptions.py:43
 #, python-format
 msgid "Unimplemented method: %s"
 msgstr ""
@@ -722,45 +514,45 @@
 msgid "A file on disk"
 msgstr ""
 
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../janitor/plugincore/core/missing_package_cruft.py:40
 msgid "Install missing package."
 msgstr ""
 
 #. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../janitor/plugincore/core/missing_package_cruft.py:50
 #, python-format
 msgid "Package %s should be installed."
 msgstr ""
 
-#: ../janitor/plugincore/core/package_cruft.py:49
+#: ../janitor/plugincore/core/package_cruft.py:50
 msgid ".deb package"
 msgstr ""
 
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
+#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:47
 #, python-format
 msgid "%s needs to be marked as manually installed."
 msgstr ""
 
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:50
 msgid ""
 "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
 "installed. See bugs.launchpad.net, bug #279621 for details."
 msgstr ""
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:45
 #, python-format
 msgid "%i obsolete entries in the status file"
 msgstr ""
 
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
+#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:48
 msgid "Obsolete entries in dpkg status"
 msgstr ""
 
 #. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
+#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:51
 msgid "Obsolete dpkg status entries"
 msgstr ""
 
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
+#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:43
 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
 msgstr ""