[gnome-software: 1/2] ui: Rename ‘Remove’ to ‘Uninstall’

[Phaedrus Leeds <mwleeds src gnome org>]

commit 2418ac4469b8cbd1ccc56f64fc0ffca05fdc938f
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Oct 9 12:04:57 2020 +0100

    ui: Rename ‘Remove’ to ‘Uninstall’
    
    This is based on feedback that gnome-software is confusing some users.
    This shifts the terminology so that ‘Uninstall’ mirrors ‘Install’.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Helps: #720

 src/gs-app-row.c        |  6 +++---
 src/gs-details-page.c   |  2 +-
 src/gs-details-page.ui  |  2 +-
 src/gs-history-dialog.c |  4 ++--
 src/gs-page.c           | 14 +++++++-------
 tests/basic.py          |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/gs-app-row.c b/src/gs-app-row.c
index 721d729bb..3e81d36a7 100644
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@ -154,7 +154,7 @@ gs_app_row_refresh_button (GsAppRow *app_row, gboolean missing_search_result)
                } else {
                        /* TRANSLATORS: this is a button next to the search results that
                         * allows the application to be easily removed */
-                       gtk_button_set_label (GTK_BUTTON (priv->button), _("Remove"));
+                       gtk_button_set_label (GTK_BUTTON (priv->button), _("Uninstall"));
                }
                break;
        case AS_APP_STATE_UPDATABLE:
@@ -163,7 +163,7 @@ gs_app_row_refresh_button (GsAppRow *app_row, gboolean missing_search_result)
                        gtk_widget_set_visible (priv->button, TRUE);
                /* TRANSLATORS: this is a button next to the search results that
                 * allows the application to be easily removed */
-               gtk_button_set_label (GTK_BUTTON (priv->button), _("Remove"));
+               gtk_button_set_label (GTK_BUTTON (priv->button), _("Uninstall"));
                break;
        case AS_APP_STATE_INSTALLING:
                gtk_widget_set_visible (priv->button, TRUE);
@@ -175,7 +175,7 @@ gs_app_row_refresh_button (GsAppRow *app_row, gboolean missing_search_result)
                gtk_widget_set_visible (priv->button, TRUE);
                /* TRANSLATORS: this is a button next to the search results that
                 * shows the status of an application being erased */
-               gtk_button_set_label (GTK_BUTTON (priv->button), _("Removing"));
+               gtk_button_set_label (GTK_BUTTON (priv->button), _("Uninstalling"));
                break;
        default:
                break;
diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 210724cee..2d6fefa05 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -1010,7 +1010,7 @@ gs_details_page_refresh_buttons (GsDetailsPage *self)
                        else
                                gtk_style_context_add_class (gtk_widget_get_style_context 
(self->button_remove), "destructive-action");
                        /* TRANSLATORS: button text in the header when an application can be erased */
-                       gtk_button_set_label (GTK_BUTTON (self->button_remove), _("_Remove"));
+                       gtk_button_set_label (GTK_BUTTON (self->button_remove), _("_Uninstall"));
                        break;
                case AS_APP_STATE_AVAILABLE_LOCAL:
                case AS_APP_STATE_AVAILABLE:
diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
index f86674fea..748b092f3 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -189,7 +189,7 @@
                               <object class="GtkButton" id="button_remove">
                                 <property name="visible">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="label" translatable="yes">_Remove</property>
+                                <property name="label" translatable="yes">_Uninstall</property>
                                 <property name="width_request">105</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
diff --git a/src/gs-history-dialog.c b/src/gs-history-dialog.c
index 7863e61ed..071c8a8ca 100644
--- a/src/gs-history-dialog.c
+++ b/src/gs-history-dialog.c
@@ -66,8 +66,8 @@ gs_history_dialog_set_app (GsHistoryDialog *dialog, GsApp *app)
                case AS_APP_STATE_AVAILABLE:
                case AS_APP_STATE_REMOVING:
                        /* TRANSLATORS: this is the status in the history UI,
-                        * where we are showing the application was removed */
-                       tmp = C_("app status", "Removed");
+                        * where we are showing the application was uninstalled */
+                       tmp = C_("app status", "Uninstalled");
                        break;
                case AS_APP_STATE_INSTALLED:
                case AS_APP_STATE_INSTALLING:
diff --git a/src/gs-page.c b/src/gs-page.c
index ab5bdc650..796efea25 100644
--- a/src/gs-page.c
+++ b/src/gs-page.c
@@ -189,7 +189,7 @@ gs_page_app_removed_cb (GObject *source,
                return;
        }
        if (!ret) {
-               g_warning ("failed to remove: %s", error->message);
+               g_warning ("failed to uninstall: %s", error->message);
                return;
        }
 
@@ -410,7 +410,7 @@ gs_page_remove_app_response_cb (GtkDialog *dialog,
        if (response != GTK_RESPONSE_OK)
                return;
 
-       g_debug ("remove %s", gs_app_get_id (helper->app));
+       g_debug ("uninstall %s", gs_app_get_id (helper->app));
        plugin_job = gs_plugin_job_newv (helper->action,
                                         "interactive", TRUE,
                                         "app", helper->app,
@@ -445,7 +445,7 @@ gs_page_remove_app (GsPage *page, GsApp *app, GCancellable *cancellable)
                                                 "interactive", TRUE,
                                                 "app", app,
                                                         NULL);
-               g_debug ("remove %s", gs_app_get_id (app));
+               g_debug ("uninstall %s", gs_app_get_id (app));
                gs_plugin_loader_job_process_async (priv->plugin_loader, plugin_job,
                                                    helper->cancellable,
                                                    gs_page_app_removed_cb,
@@ -463,17 +463,17 @@ gs_page_remove_app (GsPage *page, GsApp *app, GCancellable *cancellable)
                                         gs_app_get_name (app));
                /* TRANSLATORS: longer dialog text */
                message = g_strdup_printf (_("All applications from %s will be "
-                                            "removed, and you will have to "
+                                            "uninstalled, and you will have to "
                                             "re-install the repository to use them again."),
                                           gs_app_get_name (app));
                break;
        default:
                /* TRANSLATORS: this is a prompt message, and '%s' is an
                 * application summary, e.g. 'GNOME Clocks' */
-               title = g_strdup_printf (_("Are you sure you want to remove %s?"),
+               title = g_strdup_printf (_("Are you sure you want to uninstall %s?"),
                                         gs_app_get_name (app));
                /* TRANSLATORS: longer dialog text */
-               message = g_strdup_printf (_("%s will be removed, and you will "
+               message = g_strdup_printf (_("%s will be uninstalled, and you will "
                                             "have to install it to use it again."),
                                           gs_app_get_name (app));
                break;
@@ -489,7 +489,7 @@ gs_page_remove_app (GsPage *page, GsApp *app, GCancellable *cancellable)
                                                  "%s", message);
 
        /* TRANSLATORS: this is button text to remove the application */
-       remove_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Remove"), GTK_RESPONSE_OK);
+       remove_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Uninstall"), GTK_RESPONSE_OK);
        context = gtk_widget_get_style_context (remove_button);
        gtk_style_context_add_class (context, "destructive-action");
 
diff --git a/tests/basic.py b/tests/basic.py
index cbca229dc..75dc63b1d 100755
--- a/tests/basic.py
+++ b/tests/basic.py
@@ -35,7 +35,7 @@ try:
     search_page = app.child('Search page')
     details_page = app.child('Details page')
     install_button = details_page.child('Install')
-    remove_button = details_page.child('Remove')
+    uninstall_button = details_page.child('Uninstall')
 
     search_page_listbox = search_page.child(roleName='list box')
 
@@ -108,7 +108,7 @@ try:
     assert (not updates_page.showing)
     assert (not search_page.showing)
     assert (details_page.showing)
-    assert (install_button.showing or remove_button.showing)
+    assert (install_button.showing or uninstall_button.showing)
     assert (back_button.showing)
     assert (root.application(app_name).child('Details page')
             .child(roleName='push button', name='History')
@@ -135,7 +135,7 @@ try:
     assert (not updates_page.showing)
     assert (search_page.showing)
     assert (not install_button.showing)
-    assert (not remove_button.showing)
+    assert (not uninstall_button.showing)
     assert (not back_button.showing)
 
     keyCombo("Escape")