From 6bee6dbce53310935dce7cb1de73e0b0be36f988 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Aug 2012 23:02:41 -0400 Subject: [PATCH] Miscellaneous string fixes Typo and punctuation fixes, and some rewording, based on a patch by Philip Withnall, bug https://bugzilla.gnome.org/review?bug=628193 --- gio/gdbusaddress.c | 4 ++-- gio/gdbusmethodinvocation.c | 4 ++-- gio/gicon.c | 2 +- gio/glib-compile-schemas.c | 12 ++++++------ gio/gsocket.c | 6 +++--- gio/gsocketclient.c | 4 ++-- gio/gsocks5proxy.c | 4 ++-- glib/gregex.c | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c index 36997b1bb..fac22b713 100644 --- a/gio/gdbusaddress.c +++ b/gio/gdbusaddress.c @@ -450,7 +450,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry, g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, - _("Address element `%s', does not contain a colon (:)"), + _("Address element `%s' does not contain a colon (:)"), address_entry); goto out; } @@ -471,7 +471,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry, g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, - _("Key/Value pair %d, `%s', in address element `%s', does not contain an equal sign"), + _("Key/Value pair %d, `%s', in address element `%s' does not contain an equal sign"), n, kv_pair, address_entry); diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c index 18e366d84..979468e6b 100644 --- a/gio/gdbusmethodinvocation.c +++ b/gio/gdbusmethodinvocation.c @@ -364,8 +364,8 @@ g_dbus_method_invocation_return_value_internal (GDBusMethodInvocation *invocatio { gchar *type_string = g_variant_type_dup_string (type); - g_warning ("Type of return value is incorrect, got `%s', expected `%s'", - g_variant_get_type_string (parameters), type_string); + g_warning ("Type of return value is incorrect: expected `%s', got `%s''", + type_string, g_variant_get_type_string (parameters)); g_variant_type_free (type); g_free (type_string); goto out; diff --git a/gio/gicon.c b/gio/gicon.c index d526b2e87..b75e06778 100644 --- a/gio/gicon.c +++ b/gio/gicon.c @@ -425,7 +425,7 @@ g_icon_new_for_string (const gchar *str, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, - _("Can't handle the supplied version the icon encoding")); + _("Can't handle the supplied version of the icon encoding")); } else { diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c index c21f4877f..2b4ef0ebb 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c @@ -1122,8 +1122,8 @@ parse_state_start_schema (ParseState *state, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _(" extends not yet " - "existing schema '%s'"), id, extends_name); + _(" extends not-yet-existing " + "schema '%s'"), id, extends_name); return; } } @@ -1138,8 +1138,8 @@ parse_state_start_schema (ParseState *state, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _(" is list of not yet " - "existing schema '%s'"), id, list_of); + _(" is list of not-yet-existing " + "schema '%s'"), id, list_of); return; } @@ -1456,7 +1456,7 @@ start_element (GMarkupParseContext *context, element_name, container); else g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT, - _("Element <%s> not allowed at toplevel"), element_name); + _("Element <%s> not allowed at the top level"), element_name); } /* 2}}} */ /* End element {{{2 */ @@ -1912,7 +1912,7 @@ set_overrides (GHashTable *schema_table, { fprintf (stderr, _("override for key `%s' in schema `%s' in " - "override file `%s' is out of the range " + "override file `%s' is outside the range " "given in the schema"), key, group, filename); diff --git a/gio/gsocket.c b/gio/gsocket.c index 5243b9a67..fffd30431 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -1675,7 +1675,7 @@ g_socket_get_protocol (GSocket *socket) * @socket: a #GSocket. * * Returns the underlying OS socket object. On unix this - * is a socket file descriptor, and on windows this is + * is a socket file descriptor, and on Windows this is * a Winsock2 SOCKET handle. This may be useful for * doing platform specific or otherwise unusual operations * on the socket. @@ -1874,7 +1874,7 @@ g_socket_bind (GSocket *socket, if (!check_socket (socket, error)) return FALSE; - /* SO_REUSEADDR on windows means something else and is not what we want. + /* SO_REUSEADDR on Windows means something else and is not what we want. It always allows the unix variant of SO_REUSEADDR anyway */ #ifndef G_OS_WIN32 { @@ -3822,7 +3822,7 @@ g_socket_send_message (GSocket *socket, if (num_messages != 0) { g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - _("GSocketControlMessage not supported on windows")); + _("GSocketControlMessage not supported on Windows")); return -1; } diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c index 63c26aa90..8f763be55 100644 --- a/gio/gsocketclient.c +++ b/gio/gsocketclient.c @@ -1026,7 +1026,7 @@ g_socket_client_connect (GSocketClient *client, g_set_error_literal (&last_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - _("Trying to proxy over non-TCP connection is not supported.")); + _("Proxying over a non-TCP connection is not supported.")); g_object_unref (connection); connection = NULL; @@ -1483,7 +1483,7 @@ g_socket_client_connected_callback (GObject *source, g_set_error_literal (&data->last_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - _("Trying to proxy over non-TCP connection is not supported.")); + _("Proxying over a non-TCP connection is not supported.")); enumerator_next_async (data); } diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c index c0a4bf936..2dac977c3 100644 --- a/gio/gsocks5proxy.c +++ b/gio/gsocks5proxy.c @@ -176,8 +176,8 @@ parse_nego_reply (const guint8 *data, case SOCKS5_AUTH_NO_ACCEPT: default: g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED, - _("The SOCKSv5 proxy requires an authentication method that is not " - "supported by GLib.")); + _("The SOCKSv5 proxy requires an authentication " + "method that is not supported by GLib.")); return FALSE; break; } diff --git a/glib/gregex.c b/glib/gregex.c index a6e671570..54a4a170a 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -332,7 +332,7 @@ translate_compile_error (gint *errcode, const gchar **errmsg) *errmsg = _("\\c at end of pattern"); break; case G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: - *errmsg = _("unrecognized character follows \\"); + *errmsg = _("unrecognized character following \\"); break; case G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: *errmsg = _("numbers out of order in {} quantifier");