[gnome-software/wip/ubuntu-changes: 25/25] Merge branch 'gnome-3-20' into wip/ubuntu-changes

[Robert Ancell <rancell src gnome org>]

commit 8b9f2eb14f3960cde679fdd35bfb57ac3c768292
Merge: 9a7c00f f312890
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Mar 16 12:28:26 2016 +1300

    Merge branch 'gnome-3-20' into wip/ubuntu-changes

 RELEASE                                        |    6 +-
 configure.ac                                   |    4 +-
 contrib/gnome-software.spec.in                 |    2 +-
 data/appdata/org.gnome.Software.appdata.xml.in |   22 +
 po/cs.po                                       |  181 ++--
 po/de.po                                       |  180 ++--
 po/el.po                                       |  185 ++--
 po/es.po                                       |  200 ++--
 po/fi.po                                       |  136 +--
 po/gl.po                                       |  170 ++--
 po/hu.po                                       |  183 ++--
 po/lt.po                                       |  146 +--
 po/pl.po                                       |  198 ++--
 po/pt_BR.po                                    |  629 ++++-------
 po/ru.po                                       | 1526 +++++++++++++++---------
 po/sk.po                                       |  200 ++--
 po/sv.po                                       |  180 ++--
 src/gnome-software.ui                          |   60 -
 src/gs-app-addon-row.c                         |    2 +-
 src/gs-app-row.c                               |    4 +-
 src/gs-app.c                                   |   20 +-
 src/gs-app.h                                   |    6 +-
 src/gs-application.c                           |   49 +-
 src/gs-page.c                                  |  210 +++-
 src/gs-page.h                                  |    6 +
 src/gs-self-test.c                             |    2 +-
 src/gs-shell-details.c                         |   84 +-
 src/gs-shell-installed.c                       |   37 +-
 src/gs-shell-updates.c                         |  104 ++-
 src/gs-shell-updates.ui                        |   21 +
 src/gs-shell.c                                 |  150 ++-
 src/gs-shell.h                                 |    2 +
 src/gs-utils.c                                 |   39 +-
 src/gs-utils.h                                 |    3 -
 src/gtk-style-hc.css                           |    6 +
 src/gtk-style.css                              |    6 +
 src/plugins/gs-appstream.c                     |    4 +-
 src/plugins/gs-plugin-dummy.c                  |    6 +-
 src/plugins/gs-plugin-fwupd.c                  |    2 +-
 src/plugins/gs-plugin-packagekit-refine.c      |    6 +-
 src/plugins/gs-plugin-packagekit-refresh.c     |    2 +-
 src/plugins/gs-plugin-xdg-app-reviews.c        |    2 +-
 42 files changed, 2685 insertions(+), 2296 deletions(-)
---
diff --cc src/gs-shell.c
index fde1cf8,5468c5d..244b89b
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@@ -796,14 -863,8 +899,11 @@@ gs_shell_show_sources (GsShell *shell
        GsShellPrivate *priv = gs_shell_get_instance_private (shell);
        GtkWidget *dialog;
  
 +      if (g_spawn_command_line_async ("software-properties-gtk", NULL))
 +              return;
 +
        dialog = gs_sources_dialog_new (priv->main_window, priv->plugin_loader);
-       g_signal_connect_swapped (dialog, "response",
-                                 G_CALLBACK (gtk_widget_destroy),
-                                 dialog);
-       gtk_window_present (GTK_WINDOW (dialog));
+       gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog));
  }
  
  void