[gnome-packagekit] Revert "Use the term software more consistently"

[Richard Hughes <rhughes src gnome org>]

commit 52d66f5374152f08aeed48511190d44a32cb1fec
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jan 13 11:45:01 2014 +0000

    Revert "Use the term software more consistently"
    
    This reverts commit 7aefdbf7bd023558bcf824da677923957a0a8bed as gnome-software
    now exists.

 src/gpk-application.c |   34 +++++++++++++++---------
 src/gpk-dbus-task.c   |   68 ++++++++++++++++--------------------------------
 2 files changed, 44 insertions(+), 58 deletions(-)
---
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 7fd46cf..53026cc 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -892,19 +892,22 @@ gpk_application_get_requires_cb (PkClient *client, GAsyncResult *res, GpkApplica
        if (array->len == 0) {
                gpk_error_dialog_modal (window,
                                        /* TRANSLATORS: no packages returned */
-                                       _("No software"),
+                                       _("No packages"),
                                        /* TRANSLATORS: this package is not required by any others */
-                                       _("No other software requires this."), NULL);
+                                       _("No other packages require this package"), NULL);
                goto out;
        }
 
        package_ids = pk_package_ids_from_id (package_id_selected);
        name = gpk_dialog_package_id_name_join_locale (package_ids);
-       title = g_strdup_printf (_("Software requires %s"), name);
+       /* TRANSLATORS: title: how many packages require this package */
+       title = g_strdup_printf (ngettext ("%i package requires %s",
+                                          "%i packages require %s",
+                                          array->len), array->len, name);
 
        /* TRANSLATORS: show a array of packages for the package */
-       message = g_strdup_printf (ngettext ("The software listed below require %s to function correctly.",
-                                            "The software listed below require %s to function correctly.",
+       message = g_strdup_printf (ngettext ("Packages listed below require %s to function correctly.",
+                                            "Packages listed below require %s to function correctly.",
                                             array->len), name);
 
        dialog = gtk_message_dialog_new (window, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1018,18 +1021,23 @@ gpk_application_get_depends_cb (PkClient *client, GAsyncResult *res, GpkApplicat
        if (array->len == 0) {
                gpk_error_dialog_modal (window,
                                        /* TRANSLATORS: no packages returned */
-                                       _("No software"),
+                                       _("No packages"),
                                        /* TRANSLATORS: this package does not depend on any others */
-                                       _("This software does not depend on any other"), NULL);
+                                       _("This package does not depend on any others"), NULL);
                goto out;
        }
 
        package_ids = pk_package_ids_from_id (package_id_selected);
        name = gpk_dialog_package_id_name_join_locale (package_ids);
-       title = g_strdup_printf (_("Additional software is required for %s"), name);
+       /* TRANSLATORS: title: show the number of other packages we depend on */
+       title = g_strdup_printf (ngettext ("%i additional package is required for %s",
+                                          "%i additional packages are required for %s",
+                                          array->len), array->len, name);
 
        /* TRANSLATORS: message: show the array of dependent packages for this package */
-       message = g_strdup_printf (_("%s requires the following additional software to function correctly."), 
name);
+       message = g_strdup_printf (ngettext ("Packages listed below are required for %s to function 
correctly.",
+                                            "Packages listed below are required for %s to function 
correctly.",
+                                            array->len), name);
 
        dialog = gtk_message_dialog_new (window, GTK_DIALOG_DESTROY_WITH_PARENT,
                                         GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", title);
@@ -1259,15 +1267,15 @@ gpk_application_suggest_better_search (GpkApplicationPrivate *priv)
        if (priv->search_mode == GPK_MODE_GROUP ||
            priv->search_mode == GPK_MODE_ALL_PACKAGES) {
                /* TRANSLATORS: be helpful, but this shouldn't happen */
-               message = _("Try entering a name in the search bar.");
+               message = _("Try entering a package name in the search bar.");
        }  else if (priv->search_mode == GPK_MODE_SELECTED) {
                /* TRANSLATORS: nothing in the package queue */
-               message = _("There is no software queued to be installed or removed.");
+               message = _("There are no packages queued to be installed or removed.");
        } else {
                if (priv->search_type == GPK_SEARCH_NAME ||
                    priv->search_type == GPK_SEARCH_FILE)
                        /* TRANSLATORS: tell the user to switch to details search mode */
-                       message = _("Try searching software descriptions by clicking the icon next to the 
search text.");
+                       message = _("Try searching package descriptions by clicking the icon next to the 
search text.");
                else
                        /* TRANSLATORS: tell the user to try harder */
                        message = _("Try again with a different search term.");
@@ -2577,7 +2585,7 @@ gpk_application_activate_about_cb (GSimpleAction *action,
                               "website-label", _("PackageKit Website"),
                               "website", "http://www.packagekit.org";,
                                /* TRANSLATORS: description of NULL, gpk-application that is */
-                              "comments", _("Software management for GNOME"),
+                              "comments", _("Package Manager for GNOME"),
                               "authors", authors,
                               "documenters", documenters,
                               "artists", artists,
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 97e04a5..677bdfa 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -274,7 +274,7 @@ gpk_dbus_task_libnotify_cb (NotifyNotification *notification, gchar *action, gpo
        if (g_strcmp0 (action, "show-error-details") == 0) {
                details = g_markup_escape_text (pk_error_get_details (task->priv->cached_error_code), -1);
                /* TRANSLATORS: detailed text about the error */
-               gpk_error_dialog (_("Error details"), _("Software error details"), details);
+               gpk_error_dialog (_("Error details"), _("Package Manager error details"), details);
                g_free (details);
        } else {
                g_warning ("unknown action id: %s", action);
@@ -302,32 +302,6 @@ gpk_dbus_task_error_msg (GpkDbusTask *dtask, const gchar *title, GError *error)
        if (error != NULL) {
                if (error->domain == GPK_DBUS_ERROR) {
                        message = gpk_error_enum_to_localised_message (error->code);
-               } else {
-                       switch (error->code) {
-                       case PK_CLIENT_ERROR_FAILED_AUTH:
-                               /* TRANSLATORS: failed authentication */
-                               message = _("You don't have the necessary privileges to perform this 
action.");
-                               gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-permissions");
-                               break;
-                       case PK_CLIENT_ERROR_CANNOT_START_DAEMON:
-                               /* TRANSLATORS: could not start system service */
-                               message = _("The software service could not be started.");
-                               gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-no-service");
-                               break;
-                       case PK_CLIENT_ERROR_INVALID_INPUT:
-                               /* TRANSLATORS: the user tried to query for something invalid */
-                               message = _("The query is not valid.");
-                               details = error->message;
-                               break;
-                       case PK_CLIENT_ERROR_INVALID_FILE:
-                               /* TRANSLATORS: the user tried to install a file that was not compatible or 
broken */
-                               message = _("The file is not valid.");
-                               details = error->message;
-                               break;
-                       default:
-                               details = error->message;
-                               break;
-                       }
                }
        }
 
@@ -520,7 +494,7 @@ gpk_dbus_task_install_package_ids (GpkDbusTask *dtask)
        GtkWindow *window;
        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_PROGRESS, 
GPK_MODAL_DIALOG_PACKAGE_PADDING);
        /* TRANSLATORS: title: installing packages */
-       gpk_modal_dialog_set_title (dtask->priv->dialog, _("Installing software"));
+       gpk_modal_dialog_set_title (dtask->priv->dialog, _("Installing packages"));
        if (dtask->priv->show_progress)
                gpk_modal_dialog_present (dtask->priv->dialog);
 
@@ -1103,7 +1077,7 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
        if (array->len == 0) {
                if (!dtask->priv->show_warning) {
                        /* TRANSLATORS: couldn't resolve name to package */
-                       title = g_strdup_printf (_("Could not find software"));
+                       title = g_strdup_printf (_("Could not find packages"));
                        info_url = gpk_vendor_get_not_found_url (dtask->priv->vendor, 
GPK_VENDOR_URL_TYPE_DEFAULT);
                        /* only show the "more info" button if there is a valid link */
                        if (info_url != NULL)
@@ -1112,7 +1086,7 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
                                gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_WARNING, 
0);
                        gpk_modal_dialog_set_title (dtask->priv->dialog, title);
                        /* TRANSLATORS: message: could not find */
-                       gpk_modal_dialog_set_message (dtask->priv->dialog, _("The software could not be found 
in any software source"));
+                       gpk_modal_dialog_set_message (dtask->priv->dialog, _("The packages could not be found 
in any software source"));
                        gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: a link to the help file */
                        gpk_modal_dialog_set_action (dtask->priv->dialog, _("More information"));
@@ -1152,7 +1126,9 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
                        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_FINISHED, 0);
                        /* TRANSLATORS: title: package is already installed */
                        gpk_modal_dialog_set_title (dtask->priv->dialog,
-                                                   _("The software is already installed"));
+                                                   ngettext ("The package is already installed",
+                                                             "The packages are already installed",
+                                                             g_strv_length (dtask->priv->package_ids)));
                        /* TRANSLATORS: message: package is already installed */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("Nothing to do."));
                        gpk_modal_dialog_present (dtask->priv->dialog);
@@ -1169,7 +1145,7 @@ gpk_dbus_task_install_package_names_resolve_cb (PkTask *task, GAsyncResult *res,
                if (dtask->priv->show_warning) {
                        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_WARNING, 0);
                        /* TRANSLATORS: failed to install, shouldn't be shown */
-                       gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to install software"));
+                       gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to install package"));
                        /* TRANSLATORS: the search gave us the wrong result. internal error. barf. */
                        gpk_modal_dialog_set_message (dtask->priv->dialog, _("Incorrect response from 
search"));
                        gpk_modal_dialog_present (dtask->priv->dialog);
@@ -1249,18 +1225,20 @@ gpk_dbus_task_install_package_names (GpkDbusTask *dtask, gchar **packages, GpkDb
 
        /* check user wanted operation */
        message = g_strdup_printf ("%s\n\n%s\n%s",
-                                  _("Additional software is required"),
+                                  /* TRANSLATORS: a program needs a package, for instance openoffice-clipart 
*/
+                                  ngettext ("An additional package is required:", "Additional packages are 
required:", len),
                                   text,
-                                  _("Do you want to search for and install this software now?"));
+                                  /* TRANSLATORS: ask the user if it's okay to search */
+                                  ngettext ("Do you want to search for and install this package now?", "Do 
you want to search for and install these packages now?", len));
        g_free (text);
 
        /* make title using application name */
        if (dtask->priv->parent_title != NULL) {
                /* TRANSLATORS: string is a program name, e.g. "Movie Player" */
-               text = g_strdup_printf (_("%s requires additional software"), dtask->priv->parent_title);
+               text = g_strdup_printf (ngettext ("%s wants to install a package", "%s wants to install 
packages", len), dtask->priv->parent_title);
        } else {
                /* TRANSLATORS: a random program which we can't get the name wants to do something */
-               text = g_strdup (_("An application requires additional software"));
+               text = g_strdup (ngettext ("A program wants to install a package", "A program wants to 
install packages", len));
        }
 
        /* TRANSLATORS: button: confirm to search for packages */
@@ -1387,7 +1365,7 @@ gpk_dbus_task_install_provide_files_search_file_cb (PkClient *client, GAsyncResu
                if (dtask->priv->show_warning) {
                        split = pk_package_id_split (package_id);
                        /* TRANSLATORS: we've already got a package that provides this file */
-                       text = g_strdup_printf (_("%s already provides this file"), 
split[PK_PACKAGE_ID_NAME]);
+                       text = g_strdup_printf (_("The %s package already provides this file"), 
split[PK_PACKAGE_ID_NAME]);
                        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_WARNING, 0);
                        /* TRANSLATORS: title */
                        gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to install file"));
@@ -1678,7 +1656,7 @@ gpk_dbus_task_codec_what_provides_cb (PkClient *client, GAsyncResult *res, GpkDb
        }
 
        title = ngettext ("Install the following plugin", "Install the following plugins", array->len);
-       message = _("Do you want to install this software now?");
+       message = ngettext ("Do you want to install this package now?", "Do you want to install these 
packages now?", array->len);
 
        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_CONFIRM, 
GPK_MODAL_DIALOG_PACKAGE_LIST);
        gpk_modal_dialog_set_package_list (dtask->priv->dialog, array);
@@ -2147,7 +2125,7 @@ gpk_dbus_task_fontconfig_what_provides_cb (PkClient *client, GAsyncResult *res,
        }
 
        /* TRANSLATORS: title: show a list of fonts */
-       title = _("Do you want to install this software now?");
+       title = ngettext ("Do you want to install this package now?", "Do you want to install these packages 
now?", array->len);
        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_CONFIRM, 
GPK_MODAL_DIALOG_PACKAGE_LIST);
        gpk_modal_dialog_set_package_list (dtask->priv->dialog, array);
        gpk_modal_dialog_set_title (dtask->priv->dialog, title);
@@ -2314,8 +2292,8 @@ gpk_dbus_task_install_fontconfig_resources (GpkDbusTask *dtask, gchar **fonts, G
                          "Additional fonts are required to view this document correctly.", len);
 
        /* TRANSLATORS: we need to download a new font package to display a document */
-       title_part = ngettext ("Do you want to search for a suitable font now?",
-                              "Do you want to search for suitable fonts now?", len);
+       title_part = ngettext ("Do you want to search for a suitable package now?",
+                              "Do you want to search for suitable packages now?", len);
 
        /* check user wanted operation */
        message = g_strdup_printf ("%s\n\n%s\n%s", title, text, title_part);
@@ -2488,7 +2466,7 @@ gpk_dbus_task_plasma_service_what_provides_cb (PkClient *client, GAsyncResult *r
        }
 
        title = ngettext ("Install the following plugin", "Install the following plugins", array->len);
-       message = _("Do you want to install this software now?");
+       message = ngettext ("Do you want to install this package now?", "Do you want to install these 
packages now?", array->len);
 
        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_CONFIRM, 
GPK_MODAL_DIALOG_PACKAGE_LIST);
        gpk_modal_dialog_set_package_list (dtask->priv->dialog, array);
@@ -2723,7 +2701,7 @@ gpk_dbus_task_printer_driver_what_provides_cb (PkClient *client, GAsyncResult *r
        }
 
        title = ngettext ("Install the following driver", "Install the following drivers", array->len);
-       message = ngettext ("Do you want to install this driver now?", "Do you want to install these drivers 
now?", array->len);
+       message = ngettext ("Do you want to install this package now?", "Do you want to install these 
packages now?", array->len);
 
        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_CONFIRM, 
GPK_MODAL_DIALOG_PACKAGE_LIST);
        gpk_modal_dialog_set_package_list (dtask->priv->dialog, array);
@@ -2931,9 +2909,9 @@ gpk_dbus_task_remove_package_by_file_search_file_cb (PkClient *client, GAsyncRes
                if (dtask->priv->show_warning) {
                        gpk_modal_dialog_setup (dtask->priv->dialog, GPK_MODAL_DIALOG_PAGE_WARNING, 0);
                        /* TRANSLATORS: failed to find the package for the file */
-                       gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to find any software"));
+                       gpk_modal_dialog_set_title (dtask->priv->dialog, _("Failed to find package for this 
file"));
                        /* TRANSLATORS: nothing found */
-                       gpk_modal_dialog_set_message (dtask->priv->dialog, _("The file could not be found in 
any available software"));
+                       gpk_modal_dialog_set_message (dtask->priv->dialog, _("The file could not be found in 
any packages"));
                        gpk_modal_dialog_set_help_id (dtask->priv->dialog, "dialog-package-not-found");
                        /* TRANSLATORS: button: show the user a button to get more help finding stuff */
                        gpk_modal_dialog_present (dtask->priv->dialog);