[gnome-software] Update third party software strings

[Kalev Lember <klember src gnome org>]

commit dfd95b9fdd01f7c25daa5fa3601e5e47d7fe5956
Author: Kalev Lember <klember redhat com>
Date:   Fri Feb 16 15:23:20 2018 +0100

    Update third party software strings
    
    We had a discussion with aday and mattdm and this is what we came up
    with.

 src/gs-overview-page.c | 34 +++++-----------------------------
 src/gs-repos-dialog.c  | 10 ++++------
 2 files changed, 9 insertions(+), 35 deletions(-)
---
diff --git a/src/gs-overview-page.c b/src/gs-overview-page.c
index f2a52b7f..505a4865 100644
--- a/src/gs-overview-page.c
+++ b/src/gs-overview-page.c
@@ -860,24 +860,6 @@ third_party_response_cb (GtkInfoBar *info_bar,
        refresh_third_party_repo (self);
 }
 
-static gchar *
-get_os_name (void)
-{
-       gchar *name = NULL;
-       g_autoptr(GsOsRelease) os_release = NULL;
-
-       os_release = gs_os_release_new (NULL);
-       if (os_release != NULL)
-               name = g_strdup (gs_os_release_get_name (os_release));
-       if (name == NULL) {
-               /* TRANSLATORS: this is the fallback text we use if we can't
-                  figure out the name of the operating system */
-               name = g_strdup (_("the operating system"));
-       }
-
-       return name;
-}
-
 static gboolean
 gs_overview_page_setup (GsPage *page,
                         GsShell *shell,
@@ -891,7 +873,6 @@ gs_overview_page_setup (GsPage *page,
        GtkAdjustment *adj;
        GtkWidget *tile;
        gint i;
-       g_autofree gchar *os_name = NULL;
        g_autofree gchar *uri = NULL;
        g_autoptr(GString) str = g_string_new (NULL);
 
@@ -903,22 +884,17 @@ gs_overview_page_setup (GsPage *page,
        priv->category_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                     g_free, (GDestroyNotify) g_object_unref);
 
-       os_name = get_os_name ();
-
-       g_string_printf (str,
-                        /* TRANSLATORS: this is the third party repositories info bar.
-                           %s gets replaced by the distro name, e.g. Fedora */
-                        _("Access additional software that is not supplied by %s through select third party 
repositories."),
-                        os_name);
+       g_string_append (str,
+                        /* TRANSLATORS: this is the third party repositories info bar. */
+                        _("Access additional software from selected third party sources."));
        g_string_append (str, " ");
        g_string_append (str,
                         /* TRANSLATORS: this is the third party repositories info bar. */
-                        _("Some of this software is proprietary and therefore has restrictions on use and 
access to source code."));
+                        _("Some of this software is proprietary and therefore has restrictions on use, 
sharing, and access to source code."));
        /* optional URL */
        uri = g_settings_get_string (priv->settings, "nonfree-software-uri");
        if (uri != NULL && uri[0] != '\0') {
-               g_string_append (str, "\n");
-               g_string_append_printf (str, "<a href=\"%s\">%s</a>", uri,
+               g_string_append_printf (str, " <a href=\"%s\">%s</a>", uri,
                                        /* TRANSLATORS: this is the clickable
                                         * link on the third party repositories info bar */
                                        _("Find out more…"));
diff --git a/src/gs-repos-dialog.c b/src/gs-repos-dialog.c
index 733d2673..e4324b1e 100644
--- a/src/gs-repos-dialog.c
+++ b/src/gs-repos-dialog.c
@@ -692,15 +692,13 @@ gs_repos_dialog_init (GsReposDialog *dialog)
        gs_repos_dialog_row_set_name (GS_REPOS_DIALOG_ROW (dialog->row_third_party),
                                      /* TRANSLATORS: info bar title in the software repositories dialog */
                                      _("Third Party Repositories"));
-       g_string_printf (str,
-                        /* TRANSLATORS: this is the third party repositories info bar.
-                           %s gets replaced by the distro name, e.g. Fedora */
-                        _("Access additional software that is not supplied by %s through select third party 
repositories."),
-                        os_name);
+       g_string_append (str,
+                        /* TRANSLATORS: this is the third party repositories info bar. */
+                        _("Access additional software from selected third party sources."));
        g_string_append (str, " ");
        g_string_append (str,
                         /* TRANSLATORS: this is the third party repositories info bar. */
-                        _("Some of this software is proprietary and therefore has restrictions on use and 
access to source code."));
+                        _("Some of this software is proprietary and therefore has restrictions on use, 
sharing, and access to source code."));
        /* optional URL */
        uri = g_settings_get_string (dialog->settings, "nonfree-software-uri");
        if (uri != NULL && uri[0] != '\0') {