gnome-packagekit r471 - in trunk: data src



Author: rhughes
Date: Thu Jan 15 10:20:48 2009
New Revision: 471
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=471&view=rev

Log:
moo

Modified:
   trunk/data/gpk-client.glade
   trunk/data/gpk-update-viewer.glade
   trunk/src/gpk-application.c
   trunk/src/gpk-client.c
   trunk/src/gpk-dialog.c
   trunk/src/gpk-enum.c
   trunk/src/gpk-watch.c

Modified: trunk/data/gpk-client.glade
==============================================================================
--- trunk/data/gpk-client.glade	(original)
+++ trunk/data/gpk-client.glade	Thu Jan 15 10:20:48 2009
@@ -102,7 +102,7 @@
                           <widget class="GtkLabel" id="label_force_height">
                             <property name="height_request">50</property>
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes"> </property>
+                            <property name="label"> </property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -122,7 +122,7 @@
                     <property name="width_request">400</property>
                     <property name="height_request">1</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes"> </property>
+                    <property name="label"> </property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>

Modified: trunk/data/gpk-update-viewer.glade
==============================================================================
--- trunk/data/gpk-update-viewer.glade	(original)
+++ trunk/data/gpk-update-viewer.glade	Thu Jan 15 10:20:48 2009
@@ -104,14 +104,19 @@
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label_last_update">
+                          <widget class="GtkLabel" id="label_last_refresh_title">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label">Unknown....</property>
+                            <property name="label" translatable="yes">Last refresh:</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label_last_update_title">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Last update:</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                           </packing>
@@ -128,23 +133,18 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label_last_update_title">
+                          <widget class="GtkLabel" id="label_last_update">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Last update:</property>
+                            <property name="label">Unknown....</property>
                           </widget>
                           <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="label_last_refresh_title">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Last refresh:</property>
-                          </widget>
-                        </child>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
@@ -218,7 +218,7 @@
                                 <child>
                                   <widget class="GtkLabel" id="label11">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">_Review</property>
+                                    <property name="label" translatable="yes" comments="Look through the list of updates, and maybe choose them one by one, as you can check the update description">_Review</property>
                                     <property name="use_underline">True</property>
                                   </widget>
                                   <packing>

Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c	(original)
+++ trunk/src/gpk-application.c	Thu Jan 15 10:20:48 2009
@@ -707,8 +707,8 @@
 		length = pk_package_list_get_size (list);
 		name = gpk_dialog_package_id_name_join_locale (package_ids);
 		/* TRANSLATORS: title: how many packages require this package */
-		title = g_strdup_printf (ngettext ("%i additional package require %s",
-						   "%i additional packages require %s",
+		title = g_strdup_printf (ngettext ("%i package requires %s",
+						   "%i packages require %s",
 						   length), length, name);
 
 		/* TRANSLATORS: show a list of packages for the package */
@@ -788,7 +788,7 @@
 						   "%i additional packages are required for %s",
 						   length), length, name);
 
-		/* TRANSLATORS: message: show the list of packages for this package */
+		/* TRANSLATORS: message: show the list of dependant packages for this package */
 		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.",
 						     length), name);

Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c	(original)
+++ trunk/src/gpk-client.c	Thu Jan 15 10:20:48 2009
@@ -1203,20 +1203,11 @@
 gpk_client_confirm_action (GpkClient *gclient, const gchar *title, const gchar *message, const gchar *action)
 {
 	GtkResponseType button;
-	gchar *title_name;
 
 	/* check the user wanted to call this method */
 	if (!gclient->priv->show_confirm_search)
 		return TRUE;
 
-	/* make title */
-	if (gclient->priv->parent_title != NULL)
-		title_name = g_strdup_printf ("%s %s", gclient->priv->parent_title, title);
-	else {
-		/* TRANSLATORS: string is an action, e.g. "wants to install a codec" */
-		title_name = g_strdup_printf (_("A program %s"), title);
-	}
-
 	/* setup UI */
 	gpk_client_dialog_setup (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, 0);
 	gpk_client_dialog_set_action (gclient->priv->dialog, action);
@@ -1227,12 +1218,10 @@
 	else
 		gpk_client_dialog_set_image (gclient->priv->dialog, "emblem-system");
 
-	gpk_client_dialog_set_title (gclient->priv->dialog, title_name);
+	gpk_client_dialog_set_title (gclient->priv->dialog, title);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-application-confirm");
 	gpk_client_dialog_present_with_time (gclient->priv->dialog, gclient->priv->timestamp);
-
-	g_free (title_name);
 	button = gpk_client_dialog_run (gclient->priv->dialog);
 
 	/* close, we're going to fail the method */
@@ -1697,8 +1686,19 @@
 				   text,
 				   /* TRANSLATORS: ask the user if it's okay to search */
 				   _("Do you want to search for this file now?"));
-	/* TRANSLATORS: generic confirm, use the application name if we can */
-	ret = gpk_client_confirm_action (gclient, _("wants to install packages"), message, _("Install"));
+	g_free (text);
+
+	/* make title using application name */
+	if (gclient->priv->parent_title != NULL) {
+		/* TRANSLATORS: string is a program name, e.g. "Movie Player" */
+		text = g_strdup_printf (ngettext ("%s wants to install a package", "%s wants to install packages", len), gclient->priv->parent_title);
+	} else {
+		/* TRANSLATORS: a random program which we can't get the name wants to do something */
+		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 */
+	ret = gpk_client_confirm_action (gclient, text, message, _("Install"));
 	g_free (text);
 	g_free (message);
 	if (!ret) {
@@ -1884,8 +1884,22 @@
 				   full_path,
 				   /* TRANSLATORS: confirm with the user */
 				   _("Do you want to search for this now?"));
-	/* TRANSLATORS: generic confirm, use the application name if we can */
-	ret = gpk_client_confirm_action (gclient, _("wants to install a file"), message, _("Install"));
+
+	/* hardcode for now as we only support one file at a time */
+	len = 1;
+
+	/* make title using application name */
+	if (gclient->priv->parent_title != NULL) {
+		/* TRANSLATORS: string is a program name, e.g. "Movie Player" */
+		text = g_strdup_printf (ngettext ("%s wants to install a file", "%s wants to install files", len), gclient->priv->parent_title);
+	} else {
+		/* TRANSLATORS: a random program which we can't get the name wants to do something */
+		text = g_strdup (ngettext ("A program wants to install a file", "A program wants to install files", len));
+	}
+
+	/* TRANSLATORS: button: confirm to search for packages */
+	ret = gpk_client_confirm_action (gclient, text, message, _("Install"));
+	g_free (text);
 	g_free (message);
 	if (!ret) {
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_CANCELLED, "did not agree to search");
@@ -2058,6 +2072,7 @@
 	guint i;
 	guint len;
 	gchar *text;
+	gchar *confirm_text;
 	gchar **parts;
 	gboolean ret;
 	GString *string;
@@ -2096,8 +2111,18 @@
 	/* display messagebox  */
 	text = g_string_free (string, FALSE);
 
-	/* TRANSLATORS: generic confirm, use the application name if we can */
-	ret = gpk_client_confirm_action (gclient, _("requires additional plugins"), text, _("Search"));
+	/* make title using application name */
+	if (gclient->priv->parent_title != NULL) {
+		/* TRANSLATORS: string is a program name, e.g. "Movie Player" */
+		confirm_text = g_strdup_printf (ngettext ("%s requires an additional plugin", "%s requires additional plugins", len), gclient->priv->parent_title);
+	} else {
+		/* TRANSLATORS: a random program which we can't get the name wants to do something */
+		confirm_text = g_strdup (ngettext ("A program requires an additional plugin", "A program requires additional plugins", len));
+	}
+
+	/* TRANSLATORS: button: confirm to search for packages */
+	ret = gpk_client_confirm_action (gclient, confirm_text, text, _("Search"));
+	g_free (confirm_text);
 	g_free (text);
 
 	return ret;
@@ -2274,6 +2299,7 @@
 	GtkResponseType button;
 	gchar *info_url;
 	gchar *message;
+	gchar *text;
 
 	g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
 	g_return_val_if_fail (mime_type != NULL, FALSE);
@@ -2300,8 +2326,21 @@
 				   /* TRANSLATORS: message: confirm with the user */
 				   _("Do you want to search for a program to open this file type now?"));
 
-	/* TRANSLATORS: generic confirm, use the application name if we can */
-	ret = gpk_client_confirm_action (gclient, _("requires a new mime type"), message, _("Search"));
+	/* hardcode for now as we only support one mime type at a time */
+	len = 1;
+
+	/* make title using application name */
+	if (gclient->priv->parent_title != NULL) {
+		/* TRANSLATORS: string is a program name, e.g. "Movie Player" */
+		text = g_strdup_printf (ngettext ("%s requires a new mime type", "%s requires new mime types", len), gclient->priv->parent_title);
+	} else {
+		/* TRANSLATORS: a random program which we can't get the name wants to do something */
+		text = g_strdup (ngettext ("A program requires a new mime type", "A program requires new mime types", len));
+	}
+
+	/* TRANSLATORS: button: confirm to search for packages */
+	ret = gpk_client_confirm_action (gclient, text, message, _("Search"));
+	g_free (text);
 	g_free (message);
 	if (!ret) {
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_CANCELLED, "did not agree to search");
@@ -2565,11 +2604,18 @@
 	message = g_strdup_printf ("%s\n\n%s\n%s", title, text, title_part);
 	g_free (text);
 
-	/* TRANSLATORS: generic confirm, the application name is used as a prefix */
-	title = ngettext ("wants to install a font", "wants to install fonts", len);
+	/* make title using application name */
+	if (gclient->priv->parent_title != NULL) {
+		/* TRANSLATORS: string is a program name, e.g. "Movie Player" */
+		text = g_strdup_printf (ngettext ("%s wants to install a font", "%s wants to install fonts", len), gclient->priv->parent_title);
+	} else {
+		/* TRANSLATORS: a random program which we can't get the name wants to do something */
+		text = g_strdup (ngettext ("A program wants to install a font", "A program wants to install fonts", len));
+	}
 
-	/* TRANSLATORS: button: confirm to install fonts */
-	ret = gpk_client_confirm_action (gclient, title, message, _("Search"));
+	/* TRANSLATORS: button: confirm to search for packages */
+	ret = gpk_client_confirm_action (gclient, text, message, _("Search"));
+	g_free (text);
 	g_free (message);
 	if (!ret) {
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_CANCELLED, "did not agree to search");

Modified: trunk/src/gpk-dialog.c
==============================================================================
--- trunk/src/gpk-dialog.c	(original)
+++ trunk/src/gpk-dialog.c	Thu Jan 15 10:20:48 2009
@@ -69,8 +69,10 @@
 	array_strv = pk_ptr_array_to_strv (array);
 	text = gpk_strv_join_locale (array_strv);
 	g_strfreev (array_strv);
-	if (text == NULL)
+	if (text == NULL) {
+		/* TRANSLATORS: This is when we have over 5 items, and we're not interested in detail */
 		text = g_strdup (_("many packages"));
+	}
 	g_ptr_array_foreach (array, (GFunc) g_free, NULL);
 	g_ptr_array_free (array, TRUE);
 	return text;

Modified: trunk/src/gpk-enum.c
==============================================================================
--- trunk/src/gpk-enum.c	(original)
+++ trunk/src/gpk-enum.c	Thu Jan 15 10:20:48 2009
@@ -696,12 +696,15 @@
 	const gchar *text = NULL;
 	switch (state) {
 	case PK_UPDATE_STATE_ENUM_STABLE:
+		/* TRANSLATORS: A distribution stability level */
 		text = _("Stable");
 		break;
 	case PK_UPDATE_STATE_ENUM_UNSTABLE:
+		/* TRANSLATORS: A distribution stability level */
 		text = _("Unstable");
 		break;
 	case PK_UPDATE_STATE_ENUM_TESTING:
+		/* TRANSLATORS: A distribution stability level */
 		text = _("Testing");
 		break;
 	default:
@@ -770,99 +773,131 @@
 	const gchar *text = NULL;
 	switch (status) {
 	case PK_STATUS_ENUM_UNKNOWN:
+		/* TRANSLATORS: This is when the status is not known */
 		text = _("Unknown state");
 		break;
 	case PK_STATUS_ENUM_SETUP:
+		/* TRANSLATORS: The transaction state */
 		text = _("Waiting for service to start");
 		break;
 	case PK_STATUS_ENUM_WAIT:
+		/* TRANSLATORS: The transaction state */
 		text = _("Waiting for other tasks");
 		break;
 	case PK_STATUS_ENUM_RUNNING:
+		/* TRANSLATORS: The transaction state */
 		text = _("Running task");
 		break;
 	case PK_STATUS_ENUM_QUERY:
+		/* TRANSLATORS: The transaction state */
 		text = _("Querying");
 		break;
 	case PK_STATUS_ENUM_INFO:
+		/* TRANSLATORS: The transaction state */
 		text = _("Getting information");
 		break;
 	case PK_STATUS_ENUM_REMOVE:
-		text = _("Removing");
+		/* TRANSLATORS: The transaction state */
+		text = _("Removing packages");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD:
-		text = _("Downloading");
+		/* TRANSLATORS: The transaction state */
+		text = _("Downloading packages");
 		break;
 	case PK_STATUS_ENUM_INSTALL:
-		text = _("Installing");
+		/* TRANSLATORS: The transaction state */
+		text = _("Installing packages");
 		break;
 	case PK_STATUS_ENUM_REFRESH_CACHE:
+		/* TRANSLATORS: The transaction state */
 		text = _("Refreshing software list");
 		break;
 	case PK_STATUS_ENUM_UPDATE:
-		text = _("Updating");
+		/* TRANSLATORS: The transaction state */
+		text = _("Updating packages");
 		break;
 	case PK_STATUS_ENUM_CLEANUP:
-		text = _("Cleaning up");
+		/* TRANSLATORS: The transaction state */
+		text = _("Cleaning up packages");
 		break;
 	case PK_STATUS_ENUM_OBSOLETE:
-		text = _("Obsoleting");
+		/* TRANSLATORS: The transaction state */
+		text = _("Obsoleting packages");
 		break;
 	case PK_STATUS_ENUM_DEP_RESOLVE:
+		/* TRANSLATORS: The transaction state */
 		text = _("Resolving dependencies");
 		break;
 	case PK_STATUS_ENUM_SIG_CHECK:
+		/* TRANSLATORS: The transaction state */
 		text = _("Checking signatures");
 		break;
 	case PK_STATUS_ENUM_ROLLBACK:
+		/* TRANSLATORS: The transaction state */
 		text = _("Rolling back");
 		break;
 	case PK_STATUS_ENUM_TEST_COMMIT:
+		/* TRANSLATORS: The transaction state */
 		text = _("Testing changes");
 		break;
 	case PK_STATUS_ENUM_COMMIT:
+		/* TRANSLATORS: The transaction state */
 		text = _("Committing changes");
 		break;
 	case PK_STATUS_ENUM_REQUEST:
+		/* TRANSLATORS: The transaction state */
 		text = _("Requesting data");
 		break;
 	case PK_STATUS_ENUM_FINISHED:
+		/* TRANSLATORS: The transaction state */
 		text = _("Finished");
 		break;
 	case PK_STATUS_ENUM_CANCEL:
+		/* TRANSLATORS: The transaction state */
 		text = _("Cancelling");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_REPOSITORY:
+		/* TRANSLATORS: The transaction state */
 		text = _("Downloading repository information");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST:
+		/* TRANSLATORS: The transaction state */
 		text = _("Downloading list of packages");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_FILELIST:
+		/* TRANSLATORS: The transaction state */
 		text = _("Downloading file lists");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_CHANGELOG:
+		/* TRANSLATORS: The transaction state */
 		text = _("Downloading lists of changes");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_GROUP:
+		/* TRANSLATORS: The transaction state */
 		text = _("Downloading groups");
 		break;
 	case PK_STATUS_ENUM_DOWNLOAD_UPDATEINFO:
+		/* TRANSLATORS: The transaction state */
 		text = _("Downloading update information");
 		break;
 	case PK_STATUS_ENUM_REPACKAGING:
+		/* TRANSLATORS: The transaction state */
 		text = _("Repackaging files");
 		break;
 	case PK_STATUS_ENUM_LOADING_CACHE:
+		/* TRANSLATORS: The transaction state */
 		text = _("Loading cache");
 		break;
 	case PK_STATUS_ENUM_SCAN_APPLICATIONS:
+		/* TRANSLATORS: The transaction state */
 		text = _("Scanning installed applications");
 		break;
 	case PK_STATUS_ENUM_GENERATE_PACKAGE_LIST:
+		/* TRANSLATORS: The transaction state */
 		text = _("Generating package lists");
 		break;
 	case PK_STATUS_ENUM_WAITING_FOR_LOCK:
+		/* TRANSLATORS: The transaction state */
 		text = _("Waiting for legacy package manager lock");
 		break;
 	default:
@@ -922,32 +957,41 @@
 	const gchar *text = NULL;
 	switch (info) {
 	case PK_INFO_ENUM_LOW:
+		/* TRANSLATORS: The type of update */
 		text = _("Trivial update");
 		break;
 	case PK_INFO_ENUM_NORMAL:
-		text = _("Update");
+		/* TRANSLATORS: The type of update */
+		text = _("Normal update");
 		break;
 	case PK_INFO_ENUM_IMPORTANT:
+		/* TRANSLATORS: The type of update */
 		text = _("Important update");
 		break;
 	case PK_INFO_ENUM_SECURITY:
+		/* TRANSLATORS: The type of update */
 		text = _("Security update");
 		break;
 	case PK_INFO_ENUM_BUGFIX:
+		/* TRANSLATORS: The type of update */
 		text = _("Bug fix update");
 		break;
 	case PK_INFO_ENUM_ENHANCEMENT:
+		/* TRANSLATORS: The type of update */
 		text = _("Enhancement update");
 		break;
 	case PK_INFO_ENUM_BLOCKED:
+		/* TRANSLATORS: The type of update */
 		text = _("Blocked update");
 		break;
 	case PK_INFO_ENUM_INSTALLED:
 	case PK_INFO_ENUM_COLLECTION_INSTALLED:
+		/* TRANSLATORS: The state of a package */
 		text = _("Installed");
 		break;
 	case PK_INFO_ENUM_AVAILABLE:
 	case PK_INFO_ENUM_COLLECTION_AVAILABLE:
+		/* TRANSLATORS: The state of a package, i.e. not installed */
 		text = _("Available");
 		break;
 	default:
@@ -965,21 +1009,27 @@
 	const gchar *text = NULL;
 	switch (info) {
 	case PK_INFO_ENUM_DOWNLOADING:
+		/* TRANSLATORS: The action of the package, in present tense */
 		text = _("Downloading");
 		break;
 	case PK_INFO_ENUM_UPDATING:
+		/* TRANSLATORS: The action of the package, in present tense */
 		text = _("Updating");
 		break;
 	case PK_INFO_ENUM_INSTALLING:
+		/* TRANSLATORS: The action of the package, in present tense */
 		text = _("Installing");
 		break;
 	case PK_INFO_ENUM_REMOVING:
+		/* TRANSLATORS: The action of the package, in present tense */
 		text = _("Removing");
 		break;
 	case PK_INFO_ENUM_CLEANUP:
+		/* TRANSLATORS: The action of the package, in present tense */
 		text = _("Cleaning up");
 		break;
 	case PK_INFO_ENUM_OBSOLETING:
+		/* TRANSLATORS: The action of the package, in present tense */
 		text = _("Obsoleting");
 		break;
 	default:
@@ -997,21 +1047,27 @@
 	const gchar *text = NULL;
 	switch (info) {
 	case PK_INFO_ENUM_DOWNLOADING:
+		/* TRANSLATORS: The action of the package, in past tense */
 		text = _("Downloaded");
 		break;
 	case PK_INFO_ENUM_UPDATING:
+		/* TRANSLATORS: The action of the package, in past tense */
 		text = _("Updated");
 		break;
 	case PK_INFO_ENUM_INSTALLING:
+		/* TRANSLATORS: The action of the package, in past tense */
 		text = _("Installed");
 		break;
 	case PK_INFO_ENUM_REMOVING:
+		/* TRANSLATORS: The action of the package, in past tense */
 		text = _("Removed");
 		break;
 	case PK_INFO_ENUM_CLEANUP:
+		/* TRANSLATORS: The action of the package, in past tense */
 		text = _("Cleaned up");
 		break;
 	case PK_INFO_ENUM_OBSOLETING:
+		/* TRANSLATORS: The action of the package, in past tense */
 		text = _("Obsoleted");
 		break;
 	default:
@@ -1029,96 +1085,127 @@
 	const gchar *text = NULL;
 	switch (role) {
 	case PK_ROLE_ENUM_UNKNOWN:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Unknown role type");
 		break;
 	case PK_ROLE_ENUM_GET_DEPENDS:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting dependencies");
 		break;
 	case PK_ROLE_ENUM_GET_UPDATE_DETAIL:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting update detail");
 		break;
 	case PK_ROLE_ENUM_GET_DETAILS:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting details");
 		break;
 	case PK_ROLE_ENUM_GET_REQUIRES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting requires");
 		break;
 	case PK_ROLE_ENUM_GET_UPDATES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting updates");
 		break;
 	case PK_ROLE_ENUM_SEARCH_DETAILS:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Searching details");
 		break;
 	case PK_ROLE_ENUM_SEARCH_FILE:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Searching for file");
 		break;
 	case PK_ROLE_ENUM_SEARCH_GROUP:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Searching groups");
 		break;
 	case PK_ROLE_ENUM_SEARCH_NAME:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Searching for package name");
 		break;
 	case PK_ROLE_ENUM_REMOVE_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Removing");
 		break;
 	case PK_ROLE_ENUM_INSTALL_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Installing");
 		break;
 	case PK_ROLE_ENUM_INSTALL_FILES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Installing file");
 		break;
 	case PK_ROLE_ENUM_REFRESH_CACHE:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Refreshing package cache");
 		break;
 	case PK_ROLE_ENUM_UPDATE_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Updating packages");
 		break;
 	case PK_ROLE_ENUM_UPDATE_SYSTEM:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Updating system");
 		break;
 	case PK_ROLE_ENUM_CANCEL:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Canceling");
 		break;
 	case PK_ROLE_ENUM_ROLLBACK:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Rolling back");
 		break;
 	case PK_ROLE_ENUM_GET_REPO_LIST:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting list of repositories");
 		break;
 	case PK_ROLE_ENUM_REPO_ENABLE:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Enabling repository");
 		break;
 	case PK_ROLE_ENUM_REPO_SET_DATA:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Setting repository data");
 		break;
 	case PK_ROLE_ENUM_RESOLVE:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Resolving");
 		break;
 	case PK_ROLE_ENUM_GET_FILES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting file list");
 		break;
 	case PK_ROLE_ENUM_WHAT_PROVIDES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting what provides");
 		break;
 	case PK_ROLE_ENUM_INSTALL_SIGNATURE:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Installing signature");
 		break;
 	case PK_ROLE_ENUM_GET_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting package lists");
 		break;
 	case PK_ROLE_ENUM_ACCEPT_EULA:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Accepting EULA");
 		break;
 	case PK_ROLE_ENUM_DOWNLOAD_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Downloading packages");
 		break;
 	case PK_ROLE_ENUM_GET_DISTRO_UPGRADES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting distribution upgrade information");
 		break;
 	case PK_ROLE_ENUM_GET_CATEGORIES:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting categories");
 		break;
 	case PK_ROLE_ENUM_GET_OLD_TRANSACTIONS:
+		/* TRANSLATORS: The role of the transaction, in present tense */
 		text = _("Getting old transactions");
 		break;
 	default:
@@ -1138,96 +1225,127 @@
 	const gchar *text = NULL;
 	switch (role) {
 	case PK_ROLE_ENUM_UNKNOWN:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Unknown role type");
 		break;
 	case PK_ROLE_ENUM_GET_DEPENDS:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got dependencies");
 		break;
 	case PK_ROLE_ENUM_GET_UPDATE_DETAIL:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got update detail");
 		break;
 	case PK_ROLE_ENUM_GET_DETAILS:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got details");
 		break;
 	case PK_ROLE_ENUM_GET_REQUIRES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got requires");
 		break;
 	case PK_ROLE_ENUM_GET_UPDATES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got updates");
 		break;
 	case PK_ROLE_ENUM_SEARCH_DETAILS:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got details");
 		break;
 	case PK_ROLE_ENUM_SEARCH_FILE:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Searched for file");
 		break;
 	case PK_ROLE_ENUM_SEARCH_GROUP:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Searched groups");
 		break;
 	case PK_ROLE_ENUM_SEARCH_NAME:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Searched for package name");
 		break;
 	case PK_ROLE_ENUM_REMOVE_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Removed packages");
 		break;
 	case PK_ROLE_ENUM_INSTALL_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Installed packages");
 		break;
 	case PK_ROLE_ENUM_INSTALL_FILES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Installed local files");
 		break;
 	case PK_ROLE_ENUM_REFRESH_CACHE:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Refreshed package cache");
 		break;
 	case PK_ROLE_ENUM_UPDATE_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Updated packages");
 		break;
 	case PK_ROLE_ENUM_UPDATE_SYSTEM:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Updated system");
 		break;
 	case PK_ROLE_ENUM_CANCEL:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Canceled");
 		break;
 	case PK_ROLE_ENUM_ROLLBACK:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Rolled back");
 		break;
 	case PK_ROLE_ENUM_GET_REPO_LIST:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got list of repositories");
 		break;
 	case PK_ROLE_ENUM_REPO_ENABLE:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Enabled repository");
 		break;
 	case PK_ROLE_ENUM_REPO_SET_DATA:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Set repository data");
 		break;
 	case PK_ROLE_ENUM_RESOLVE:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Resolved");
 		break;
 	case PK_ROLE_ENUM_GET_FILES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got file list");
 		break;
 	case PK_ROLE_ENUM_WHAT_PROVIDES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got what provides");
 		break;
 	case PK_ROLE_ENUM_INSTALL_SIGNATURE:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Installed signature");
 		break;
 	case PK_ROLE_ENUM_GET_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got package lists");
 		break;
 	case PK_ROLE_ENUM_ACCEPT_EULA:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Accepted EULA");
 		break;
 	case PK_ROLE_ENUM_DOWNLOAD_PACKAGES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Downloaded packages");
 		break;
 	case PK_ROLE_ENUM_GET_DISTRO_UPGRADES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got distribution upgrades");
 		break;
 	case PK_ROLE_ENUM_GET_CATEGORIES:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got categories");
 		break;
 	case PK_ROLE_ENUM_GET_OLD_TRANSACTIONS:
+		/* TRANSLATORS: The role of the transaction, in past tense */
 		text = _("Got old transactions");
 		break;
 	default:
@@ -1245,108 +1363,143 @@
 	const gchar *text = NULL;
 	switch (group) {
 	case PK_GROUP_ENUM_ACCESSIBILITY:
+		/* TRANSLATORS: The group type */
 		text = _("Accessibility");
 		break;
 	case PK_GROUP_ENUM_ACCESSORIES:
+		/* TRANSLATORS: The group type */
 		text = _("Accessories");
 		break;
 	case PK_GROUP_ENUM_EDUCATION:
+		/* TRANSLATORS: The group type */
 		text = _("Education");
 		break;
 	case PK_GROUP_ENUM_GAMES:
+		/* TRANSLATORS: The group type */
 		text = _("Games");
 		break;
 	case PK_GROUP_ENUM_GRAPHICS:
+		/* TRANSLATORS: The group type */
 		text = _("Graphics");
 		break;
 	case PK_GROUP_ENUM_INTERNET:
+		/* TRANSLATORS: The group type */
 		text = _("Internet");
 		break;
 	case PK_GROUP_ENUM_OFFICE:
+		/* TRANSLATORS: The group type */
 		text = _("Office");
 		break;
 	case PK_GROUP_ENUM_OTHER:
+		/* TRANSLATORS: The group type */
 		text = _("Other");
 		break;
 	case PK_GROUP_ENUM_PROGRAMMING:
+		/* TRANSLATORS: The group type */
 		text = _("Programming");
 		break;
 	case PK_GROUP_ENUM_MULTIMEDIA:
+		/* TRANSLATORS: The group type */
 		text = _("Multimedia");
 		break;
 	case PK_GROUP_ENUM_SYSTEM:
+		/* TRANSLATORS: The group type */
 		text = _("System");
 		break;
 	case PK_GROUP_ENUM_DESKTOP_GNOME:
+		/* TRANSLATORS: The group type */
 		text = _("GNOME desktop");
 		break;
 	case PK_GROUP_ENUM_DESKTOP_KDE:
+		/* TRANSLATORS: The group type */
 		text = _("KDE desktop");
 		break;
 	case PK_GROUP_ENUM_DESKTOP_XFCE:
+		/* TRANSLATORS: The group type */
 		text = _("XFCE desktop");
 		break;
 	case PK_GROUP_ENUM_DESKTOP_OTHER:
+		/* TRANSLATORS: The group type */
 		text = _("Other desktops");
 		break;
 	case PK_GROUP_ENUM_PUBLISHING:
+		/* TRANSLATORS: The group type */
 		text = _("Publishing");
 		break;
 	case PK_GROUP_ENUM_SERVERS:
+		/* TRANSLATORS: The group type */
 		text = _("Servers");
 		break;
 	case PK_GROUP_ENUM_FONTS:
+		/* TRANSLATORS: The group type */
 		text = _("Fonts");
 		break;
 	case PK_GROUP_ENUM_ADMIN_TOOLS:
+		/* TRANSLATORS: The group type */
 		text = _("Admin tools");
 		break;
 	case PK_GROUP_ENUM_LEGACY:
+		/* TRANSLATORS: The group type */
 		text = _("Legacy");
 		break;
 	case PK_GROUP_ENUM_LOCALIZATION:
+		/* TRANSLATORS: The group type */
 		text = _("Localization");
 		break;
 	case PK_GROUP_ENUM_VIRTUALIZATION:
+		/* TRANSLATORS: The group type */
 		text = _("Virtualization");
 		break;
 	case PK_GROUP_ENUM_SECURITY:
+		/* TRANSLATORS: The group type */
 		text = _("Security");
 		break;
 	case PK_GROUP_ENUM_POWER_MANAGEMENT:
+		/* TRANSLATORS: The group type */
 		text = _("Power management");
 		break;
 	case PK_GROUP_ENUM_COMMUNICATION:
+		/* TRANSLATORS: The group type */
 		text = _("Communication");
 		break;
 	case PK_GROUP_ENUM_NETWORK:
+		/* TRANSLATORS: The group type */
 		text = _("Network");
 		break;
 	case PK_GROUP_ENUM_MAPS:
+		/* TRANSLATORS: The group type */
 		text = _("Maps");
 		break;
 	case PK_GROUP_ENUM_REPOS:
+		/* TRANSLATORS: The group type */
 		text = _("Software sources");
 		break;
 	case PK_GROUP_ENUM_SCIENCE:
+		/* TRANSLATORS: The group type */
 		text = _("Science");
 		break;
 	case PK_GROUP_ENUM_DOCUMENTATION:
+		/* TRANSLATORS: The group type */
 		text = _("Documentation");
 		break;
 	case PK_GROUP_ENUM_ELECTRONICS:
+		/* TRANSLATORS: The group type */
 		text = _("Electronics");
 		break;
 	case PK_GROUP_ENUM_COLLECTIONS:
+		/* TRANSLATORS: The group type */
 		text = _("Package collections");
 		break;
 	case PK_GROUP_ENUM_VENDOR:
+		/* TRANSLATORS: The group type */
 		text = _("Vendor");
 		break;
 	case PK_GROUP_ENUM_NEWEST:
+		/* TRANSLATORS: The group type */
 		text = _("Newest packages");
 		break;
 	case PK_GROUP_ENUM_UNKNOWN:
+		/* TRANSLATORS: The group type */
 		text = _("Unknown group");
 		break;
 	default:

Modified: trunk/src/gpk-watch.c
==============================================================================
--- trunk/src/gpk-watch.c	(original)
+++ trunk/src/gpk-watch.c	Thu Jan 15 10:20:48 2009
@@ -101,6 +101,7 @@
 	PkTaskListItem *item;
 	guint length;
 	GString *status;
+	const gchar *trailer;
 	const gchar *localised_status;
 
 	g_return_val_if_fail (GPK_IS_WATCH (watch), FALSE);
@@ -131,9 +132,8 @@
 		/* don't fill the screen with a giant tooltip */
 		if (i > GPK_WATCH_MAXIMUM_TOOLTIP_LINES) {
 			/* TRANSLATORS: if the menu won't fit, inform the user there are a few more things waiting */
-			g_string_append_printf (status, _("(%i more tasks)"),
-						i - GPK_WATCH_MAXIMUM_TOOLTIP_LINES);
-			g_string_append_c (status, '\n');
+			trailer = ngettext ("(%i more task)", "(%i more tasks)", i - GPK_WATCH_MAXIMUM_TOOLTIP_LINES);
+			g_string_append_printf (status, "%s\n", trailer);
 			break;
 		}
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]