luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous string fixes

Browse Source 
Typo and punctuation fixes, and some rewording, based
on a patch by Philip Withnall, bug
https://bugzilla.gnome.org/review?bug=628193
This commit is contained in:
Matthias Clasen 2012-08-16 23:02:41 -04:00
parent e4dc223e9d
commit 6bee6dbce5
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gdbusaddress.c
View File

@ -450,7 +450,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error, g_set_error (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Address element `%s', does not contain a colon (:)"), _("Address element `%s' does not contain a colon (:)"),
address_entry); address_entry);
goto out; goto out;
} }
@ -471,7 +471,7 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
g_set_error (error, g_set_error (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, 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, n,
kv_pair, kv_pair,
address_entry); address_entry);

4
gio/gdbusmethodinvocation.c
View File

@ -364,8 +364,8 @@ g_dbus_method_invocation_return_value_internal (GDBusMethodInvocation *invocatio
{ {
gchar *type_string = g_variant_type_dup_string (type); gchar *type_string = g_variant_type_dup_string (type);
g_warning ("Type of return value is incorrect, got `%s', expected `%s'", g_warning ("Type of return value is incorrect: expected `%s', got `%s''",
g_variant_get_type_string (parameters), type_string); type_string, g_variant_get_type_string (parameters));
g_variant_type_free (type); g_variant_type_free (type);
g_free (type_string); g_free (type_string);
goto out; goto out;

2
gio/gicon.c
View File

@ -425,7 +425,7 @@ g_icon_new_for_string (const gchar *str,
g_set_error_literal (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, 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 else
{ {

12
gio/glib-compile-schemas.c
View File

@ -1122,8 +1122,8 @@ parse_state_start_schema (ParseState *state,
{ {
g_set_error (error, G_MARKUP_ERROR, g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT, G_MARKUP_ERROR_INVALID_CONTENT,
_("<schema id='%s'> extends not yet " _("<schema id='%s'> extends not-yet-existing "
"existing schema '%s'"), id, extends_name); "schema '%s'"), id, extends_name);
return; return;
} }
} }
@ -1138,8 +1138,8 @@ parse_state_start_schema (ParseState *state,
{ {
g_set_error (error, G_MARKUP_ERROR, g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT, G_MARKUP_ERROR_INVALID_CONTENT,
_("<schema id='%s'> is list of not yet " _("<schema id='%s'> is list of not-yet-existing "
"existing schema '%s'"), id, list_of); "schema '%s'"), id, list_of);
return; return;
} }
@ -1456,7 +1456,7 @@ start_element (GMarkupParseContext *context,
element_name, container); element_name, container);
else else
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT, 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}}} */ /* 2}}} */
/* End element {{{2 */ /* End element {{{2 */
@ -1912,7 +1912,7 @@ set_overrides (GHashTable *schema_table,
{ {
fprintf (stderr, fprintf (stderr,
_("override for key `%s' in schema `%s' in " _("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"), "given in the schema"),
key, group, filename); key, group, filename);

6
gio/gsocket.c
View File

@ -1675,7 +1675,7 @@ g_socket_get_protocol (GSocket *socket)
* @socket: a #GSocket. * @socket: a #GSocket.
* *
* Returns the underlying OS socket object. On unix this * 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 * a Winsock2 SOCKET handle. This may be useful for
* doing platform specific or otherwise unusual operations * doing platform specific or otherwise unusual operations
* on the socket. * on the socket.
@ -1874,7 +1874,7 @@ g_socket_bind (GSocket *socket,
if (!check_socket (socket, error)) if (!check_socket (socket, error))
return FALSE; 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 */ It always allows the unix variant of SO_REUSEADDR anyway */
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
{ {
@ -3822,7 +3822,7 @@ g_socket_send_message (GSocket *socket,
if (num_messages != 0) if (num_messages != 0)
{ {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, 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; return -1;
} }

4
gio/gsocketclient.c
View File

@ -1026,7 +1026,7 @@ g_socket_client_connect (GSocketClient *client,
g_set_error_literal (&last_error, g_set_error_literal (&last_error,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, 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); g_object_unref (connection);
connection = NULL; connection = NULL;
@ -1483,7 +1483,7 @@ g_socket_client_connected_callback (GObject *source,
g_set_error_literal (&data->last_error, g_set_error_literal (&data->last_error,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, 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); enumerator_next_async (data);
} }

4
gio/gsocks5proxy.c
View File

@ -176,8 +176,8 @@ parse_nego_reply (const guint8 *data,
case SOCKS5_AUTH_NO_ACCEPT: case SOCKS5_AUTH_NO_ACCEPT:
default: default:
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_AUTH_FAILED,
_("The SOCKSv5 proxy requires an authentication method that is not " _("The SOCKSv5 proxy requires an authentication "
"supported by GLib.")); "method that is not supported by GLib."));
return FALSE; return FALSE;
break; break;
} }

2
glib/gregex.c
View File

@ -332,7 +332,7 @@ translate_compile_error (gint *errcode, const gchar **errmsg)
*errmsg = _("\\c at end of pattern"); *errmsg = _("\\c at end of pattern");
break; break;
case G_REGEX_ERROR_UNRECOGNIZED_ESCAPE: case G_REGEX_ERROR_UNRECOGNIZED_ESCAPE:
*errmsg = _("unrecognized character follows \\"); *errmsg = _("unrecognized character following \\");
break; break;
case G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER: case G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER:
*errmsg = _("numbers out of order in {} quantifier"); *errmsg = _("numbers out of order in {} quantifier");