GNOME.org
 

[gnome-color-manager] Include the trailing colon in translated strings. Fixes #619967

commit ece02fc3380dfc34290deab1a17c86c9d9902f92
Author: Richard Hughes <richard hughsie com>
Date:   Sat May 29 08:22:57 2010 +0100

    Include the trailing colon in translated strings. Fixes #619967

 src/gcm-dump-edid.c           |   20 ++++++++++----------
 src/gcm-inspect.c             |   28 ++++++++++++++--------------
 src/gcm-install-system-wide.c |   24 ++++++++++++------------
 src/gcm-utils.c               |    8 ++++----
 4 files changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/src/gcm-dump-edid.c b/src/gcm-dump-edid.c
index b9efb3a..15cfabb 100644
--- a/src/gcm-dump-edid.c
+++ b/src/gcm-dump-edid.c
@@ -55,7 +55,7 @@ gcm_dump_edid_filename (const gchar *filename)
 	ret = g_file_get_contents (filename, &data, NULL, &error);
 	if (!ret) {
 		/* TRANSLATORS: this is when the EDID file cannot be read */
-		g_print ("%s: %s\n", _("Cannot load file contents"), error->message);
+		g_print ("%s %s\n", _("Cannot load file contents:"), error->message);
 		goto out;
 	}
 
@@ -64,7 +64,7 @@ gcm_dump_edid_filename (const gchar *filename)
 	ret = gcm_edid_parse (edid, (const guint8 *) data, &error);
 	if (!ret) {
 		/* TRANSLATORS: this is when the EDID cannot be parsed */
-		g_print ("%s: %s\n", _("Cannot parse EDID contents"), error->message);
+		g_print ("%s %s\n", _("Cannot parse EDID contents:"), error->message);
 		goto out;
 	}
 
@@ -72,38 +72,38 @@ gcm_dump_edid_filename (const gchar *filename)
 	monitor_name = gcm_edid_get_monitor_name (edid);
 	if (monitor_name != NULL) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %s\n", _("Monitor name"), monitor_name);
+		g_print ("  %s %s\n", _("Monitor name:"), monitor_name);
 	}
 	vendor_name = gcm_edid_get_vendor_name (edid);
 	if (vendor_name != NULL) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %s\n", _("Vendor name"), vendor_name);
+		g_print ("  %s %s\n", _("Vendor name:"), vendor_name);
 	}
 	serial_number = gcm_edid_get_serial_number (edid);
 	if (serial_number != NULL) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %s\n", _("Serial number"), serial_number);
+		g_print ("  %s %s\n", _("Serial number:"), serial_number);
 	}
 	eisa_id = gcm_edid_get_eisa_id (edid);
 	if (eisa_id != NULL) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %s\n", _("EISA ID"), eisa_id);
+		g_print ("  %s %s\n", _("EISA ID:"), eisa_id);
 	}
 	pnp_id = gcm_edid_get_pnp_id (edid);
 	if (pnp_id != NULL) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %s\n", _("PNP identifier"), pnp_id);
+		g_print ("  %s %s\n", _("PNP identifier:"), pnp_id);
 	}
 	width = gcm_edid_get_width (edid);
 	height = gcm_edid_get_height (edid);
 	if (width != 0) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %ix%i\n", _("Size"), width, height);
+		g_print ("  %s %ix%i\n", _("Size:"), width, height);
 	}
 	gamma = gcm_edid_get_gamma (edid);
 	if (gamma > 0.0f) {
 		/* TRANSLATORS: this is debugging output for the supplied EDID file */
-		g_print ("  %s: %f\n", _("Gamma"), gamma);
+		g_print ("  %s %f\n", _("Gamma:"), gamma);
 	}
 out:
 	if (edid != NULL)
@@ -156,7 +156,7 @@ main (int argc, char **argv)
 	if (files != NULL) {
 		for (i=0; files[i] != NULL; i++) {
 			/* TRANSLATORS: this is the filename we are displaying */
-			g_print ("%s: %s\n", _("EDID dump"), files[i]);
+			g_print ("%s %s\n", _("EDID dump:"), files[i]);
 			gcm_dump_edid_filename (files[i]);
 		}
 		goto out;
diff --git a/src/gcm-inspect.c b/src/gcm-inspect.c
index ac85f13..3f65e00 100644
--- a/src/gcm-inspect.c
+++ b/src/gcm-inspect.c
@@ -173,7 +173,7 @@ gcm_inspect_show_profiles_for_device (const gchar *device_id)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -191,7 +191,7 @@ gcm_inspect_show_profiles_for_device (const gchar *device_id)
 						-1, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		g_print ("%s: %s\n", _("The request failed"), error->message);
+		g_print ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -242,7 +242,7 @@ gcm_inspect_show_profiles_for_file (const gchar *filename)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -260,7 +260,7 @@ gcm_inspect_show_profiles_for_file (const gchar *filename)
 						-1, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		g_print ("%s: %s\n", _("The request failed"), error->message);
+		g_print ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -310,7 +310,7 @@ gcm_inspect_show_profiles_for_devices (void)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -327,7 +327,7 @@ gcm_inspect_show_profiles_for_devices (void)
 						-1, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		g_print ("%s: %s\n", _("The request failed"), error->message);
+		g_print ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -371,7 +371,7 @@ gcm_inspect_show_profile_for_window (guint xid)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -389,7 +389,7 @@ gcm_inspect_show_profile_for_window (guint xid)
 						-1, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		g_print ("%s: %s\n", _("The request failed"), error->message);
+		g_print ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -441,7 +441,7 @@ gcm_inspect_show_profiles_for_type (const gchar *type)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -459,7 +459,7 @@ gcm_inspect_show_profiles_for_type (const gchar *type)
 						-1, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		g_print ("%s: %s\n", _("The request failed"), error->message);
+		g_print ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -507,13 +507,13 @@ gcm_inspect_proxy_appeared_cb (GDBusConnection *connection,
 	result = g_dbus_proxy_get_cached_property (proxy, "RenderingIntentDisplay");
 	if (result != NULL) {
 		/* TRANSLATORS: this is the rendering intent of the output */
-		g_print ("%s:\t%s\n", _("Rendering intent (display)"), g_variant_get_string (result, NULL));
+		g_print ("%s\t%s\n", _("Rendering intent (display):"), g_variant_get_string (result, NULL));
 		g_variant_unref (result);
 	}
 	result = g_dbus_proxy_get_cached_property (proxy, "RenderingIntentSoftproof");
 	if (result != NULL) {
 		/* TRANSLATORS: this is the rendering intent of the printer */
-		g_print ("%s:\t%s\n", _("Rendering intent (softproof)"), g_variant_get_string (result, NULL));
+		g_print ("%s\t%s\n", _("Rendering intent (softproof):"), g_variant_get_string (result, NULL));
 		g_variant_unref (result);
 	}
 
@@ -521,13 +521,13 @@ gcm_inspect_proxy_appeared_cb (GDBusConnection *connection,
 	result = g_dbus_proxy_get_cached_property (proxy, "RenderingIntentDisplay");
 	if (result != NULL) {
 		/* TRANSLATORS: this is the rendering intent of the output */
-		g_print ("%s:\t%s\n", _("RGB Colorspace"), g_variant_get_string (result, NULL));
+		g_print ("%s\t%s\n", _("RGB Colorspace:"), g_variant_get_string (result, NULL));
 		g_variant_unref (result);
 	}
 	result = g_dbus_proxy_get_cached_property (proxy, "RenderingIntentSoftproof");
 	if (result != NULL) {
 		/* TRANSLATORS: this is the rendering intent of the printer */
-		g_print ("%s:\t%s\n", _("CMYK Colorspace"), g_variant_get_string (result, NULL));
+		g_print ("%s\t%s\n", _("CMYK Colorspace:"), g_variant_get_string (result, NULL));
 		g_variant_unref (result);
 	}
 
diff --git a/src/gcm-install-system-wide.c b/src/gcm-install-system-wide.c
index 268f3e1..50e1f07 100644
--- a/src/gcm-install-system-wide.c
+++ b/src/gcm-install-system-wide.c
@@ -146,7 +146,7 @@ main (gint argc, gchar *argv[])
 	/* no input */
 	if (filenames == NULL || g_strv_length (filenames) != 1) {
 		/* TRANSLATORS: user did not specify a valid filename */
-		g_print ("%s\n", _("You need to specify exactly one ICC profile filename"));
+		g_print ("%s\n", _("You need to specify exactly one ICC profile filename."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_ARGUMENTS_INVALID;
 		goto out;
 	}
@@ -154,7 +154,7 @@ main (gint argc, gchar *argv[])
 	/* no id */
 	if (id == NULL) {
 		/* TRANSLATORS: user did not specify a valid device ID */
-		g_print ("%s\n", _("You need to specify exactly one device ID"));
+		g_print ("%s\n", _("You need to specify exactly one device ID."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_ARGUMENTS_INVALID;
 		goto out;
 	}
@@ -163,7 +163,7 @@ main (gint argc, gchar *argv[])
 	ret = gcm_install_system_wide_is_alphanum_lcase (id);
 	if (!ret) {
 		/* TRANSLATORS: user did not specify a valid device ID */
-		g_print ("%s\n", _("The device ID has invalid characters"));
+		g_print ("%s\n", _("The device ID has invalid characters."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_ARGUMENTS_INVALID;
 		goto out;
 	}
@@ -173,7 +173,7 @@ main (gint argc, gchar *argv[])
 	euid = geteuid ();
 	if (uid != 0 || euid != 0) {
 		/* TRANSLATORS: only able to install profiles as root */
-		g_print ("%s\n", _("This program can only be used by the root user"));
+		g_print ("%s\n", _("This program can only be used by the root user."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_ARGUMENTS_INVALID;
 		goto out;
 	}
@@ -182,7 +182,7 @@ main (gint argc, gchar *argv[])
 	ret = g_path_is_absolute (filenames[0]);
 	if (!ret) {
 		/* TRANSLATORS: only able to install profiles with an absolute path */
-		g_print ("%s\n", _("The source filename must be absolute"));
+		g_print ("%s\n", _("The source filename must be absolute."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_ARGUMENTS_INVALID;
 		goto out;
 	}
@@ -193,7 +193,7 @@ main (gint argc, gchar *argv[])
 				  G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &error);
 	if (info == NULL) {
 		/* TRANSLATORS: error details */
-		g_print ("%s: %s\n", _("Failed to get content type"), error->message);
+		g_print ("%s %s\n", _("Failed to get content type:"), error->message);
 		g_error_free (error);
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_CONTENT_TYPE_INVALID;
 		goto out;
@@ -203,7 +203,7 @@ main (gint argc, gchar *argv[])
 	type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
 	if (g_strcmp0 (type, "application/vnd.iccprofile") != 0) {
 		/* TRANSLATORS: the content type is the detected type of file */
-		g_print ("%s: %s\n", _("Content type was incorrect"), type);
+		g_print ("%s %s\n", _("Content type was incorrect:"), type);
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_CONTENT_TYPE_INVALID;
 		goto out;
 	}
@@ -212,7 +212,7 @@ main (gint argc, gchar *argv[])
 	pkexec_uid_str = g_getenv ("PKEXEC_UID");
 	if (pkexec_uid_str == NULL) {
 		/* TRANSLATORS: the program must never be directly run */
-		g_print ("%s: %s\n", _("This program must only be run through pkexec"), type);
+		g_print ("%s\n", _("This program must only be run through pkexec."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_INVALID_USER;
 		goto out;
 	}
@@ -221,7 +221,7 @@ main (gint argc, gchar *argv[])
 	ret = egg_strtouint (pkexec_uid_str, &pkexec_uid);
 	if (!ret) {
 		/* TRANSLATORS: PolicyKit has gone all insane on us, and we refuse to parse junk */
-		g_print ("%s: %s\n", _("PKEXEC_UID must be set to an integer value"), type);
+		g_print ("%s\n", _("PKEXEC_UID must be set to an integer value."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_INVALID_USER;
 		goto out;
 	}
@@ -230,7 +230,7 @@ main (gint argc, gchar *argv[])
 	file_uid = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_UID);
 	if (file_uid != pkexec_uid) {
 		/* TRANSLATORS: we are complaining that a file must be really owned by the user who called this program */
-		g_print ("%s: %s\n", _("The ICC profile must be owned by you"), type);
+		g_print ("%s\n", _("The ICC profile must be owned by the user."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_INVALID_USER;
 		goto out;
 	}
@@ -243,7 +243,7 @@ main (gint argc, gchar *argv[])
 	ret = g_path_is_absolute (dest);
 	if (!ret) {
 		/* TRANSLATORS: only able to install profiles with an absolute path */
-		g_print ("%s\n", _("The destination filename must be absolute"));
+		g_print ("%s\n", _("The destination filename must be absolute."));
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_ARGUMENTS_INVALID;
 		goto out;
 	}
@@ -253,7 +253,7 @@ main (gint argc, gchar *argv[])
 	ret = g_file_copy (file, file_dest, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error);
 	if (!ret) {
 		/* TRANSLATORS: error details */
-		g_print ("%s: %s\n", _("Failed to copy"), error->message);
+		g_print ("%s %s\n", _("Failed to copy:"), error->message);
 		g_error_free (error);
 		retval = GCM_INSTALL_SYSTEM_WIDE_EXIT_CODE_FAILED_TO_COPY;
 		goto out;
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 7145209..5c69246 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -161,7 +161,7 @@ gcm_utils_install_package (const gchar *package_name, GtkWindow *window)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -185,7 +185,7 @@ gcm_utils_install_package (const gchar *package_name, GtkWindow *window)
 						G_MAXINT, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		egg_warning ("%s: %s\n", _("The request failed"), error->message);
+		egg_warning ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -226,7 +226,7 @@ gcm_utils_is_package_installed (const gchar *package_name)
 	connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
 	if (connection == NULL) {
 		/* TRANSLATORS: no DBus session bus */
-		g_print ("%s: %s\n", _("Failed to connect to session bus"), error->message);
+		g_print ("%s %s\n", _("Failed to connect to session bus:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
@@ -244,7 +244,7 @@ gcm_utils_is_package_installed (const gchar *package_name)
 						G_MAXINT, NULL, &error);
 	if (response == NULL) {
 		/* TRANSLATORS: the DBus method failed */
-		egg_warning ("%s: %s\n", _("The request failed"), error->message);
+		egg_warning ("%s %s\n", _("The request failed:"), error->message);
 		g_error_free (error);
 		goto out;
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]