mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-09 19:06:15 +01:00
Revert "Partially revert 10c490cdfe3ae042f747bd00f787492e2bdb7ed0"
This reverts commit 2d56c49b10.
This commit is contained in:
Piotr Drąg
parent
0bb3cacacb
commit
b974cccdaf
@ -4121,7 +4121,7 @@ invoke_get_property_in_idle_cb (gpointer _data)
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (data->message,
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
_("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
|
||||
_("No such interface “org.freedesktop.DBus.Properties” on object at path %s"),
|
||||
g_dbus_message_get_path (data->message));
|
||||
g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4263,7 +4263,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("No such property '%s'"),
|
||||
_("No such property “%s”"),
|
||||
property_name);
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4275,7 +4275,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("Property '%s' is not readable"),
|
||||
_("Property “%s” is not readable"),
|
||||
property_name);
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4286,7 +4286,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("Property '%s' is not writable"),
|
||||
_("Property “%s” is not writable"),
|
||||
property_name);
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4306,7 +4306,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("Error setting property '%s': Expected type '%s' but got '%s'"),
|
||||
_("Error setting property “%s”: Expected type “%s” but got “%s”"),
|
||||
property_name, property_info->signature,
|
||||
g_variant_get_type_string (value));
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
@ -4411,7 +4411,7 @@ handle_getset_property (GDBusConnection *connection,
|
||||
GDBusMessage *reply;
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("No such interface '%s'"),
|
||||
_("No such interface “%s”"),
|
||||
interface_name);
|
||||
g_dbus_connection_send_message_unlocked (eo->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4468,7 +4468,7 @@ invoke_get_all_properties_in_idle_cb (gpointer _data)
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (data->message,
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
_("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
|
||||
_("No such interface “org.freedesktop.DBus.Properties” on object at path %s"),
|
||||
g_dbus_message_get_path (data->message));
|
||||
g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4837,7 +4837,7 @@ call_in_idle_cb (gpointer user_data)
|
||||
GDBusMessage *reply;
|
||||
reply = g_dbus_message_new_method_error (g_dbus_method_invocation_get_message (invocation),
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
_("No such interface '%s' on object at path %s"),
|
||||
_("No such interface “%s” on object at path %s"),
|
||||
g_dbus_method_invocation_get_interface_name (invocation),
|
||||
g_dbus_method_invocation_get_object_path (invocation));
|
||||
g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
@ -4935,7 +4935,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
|
||||
{
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
_("No such method '%s'"),
|
||||
_("No such method “%s”"),
|
||||
g_dbus_message_get_member (message));
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -4966,7 +4966,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
|
||||
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("Type of message, '%s', does not match expected type '%s'"),
|
||||
_("Type of message, “%s”, does not match expected type “%s”"),
|
||||
g_variant_get_type_string (parameters),
|
||||
type_string);
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
@ -5624,7 +5624,7 @@ decode_method_reply (GDBusMessage *reply,
|
||||
g_set_error (error,
|
||||
G_IO_ERROR,
|
||||
G_IO_ERROR_INVALID_ARGUMENT,
|
||||
_("Method '%s' returned type '%s', but expected '%s'"),
|
||||
_("Method “%s” returned type “%s”, but expected “%s”"),
|
||||
method_name, g_variant_get_type_string (result), type_string);
|
||||
|
||||
g_variant_unref (result);
|
||||
@ -6588,7 +6588,7 @@ handle_subtree_method_invocation (GDBusConnection *connection,
|
||||
GDBusMessage *reply;
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||
_("No such interface '%s'"),
|
||||
_("No such interface “%s”"),
|
||||
interface_name);
|
||||
g_dbus_connection_send_message (es->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
g_object_unref (reply);
|
||||
@ -6699,7 +6699,7 @@ process_subtree_vtable_message_in_idle_cb (gpointer _data)
|
||||
GDBusMessage *reply;
|
||||
reply = g_dbus_message_new_method_error (data->message,
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
_("Method '%s' on interface '%s' with signature '%s' does not exist"),
|
||||
_("Method “%s” on interface “%s” with signature “%s” does not exist"),
|
||||
g_dbus_message_get_member (data->message),
|
||||
g_dbus_message_get_interface (data->message),
|
||||
g_dbus_message_get_signature (data->message));
|
||||
@ -7097,7 +7097,7 @@ distribute_method_call (GDBusConnection *connection,
|
||||
/* if we end up here, the message has not been not handled - so return an error saying this */
|
||||
reply = g_dbus_message_new_method_error (message,
|
||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||
_("No such interface '%s' on object at path %s"),
|
||||
_("No such interface “%s” on object at path %s"),
|
||||
interface_name,
|
||||
object_path);
|
||||
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
|
||||
@ -7149,7 +7149,7 @@ message_bus_get_singleton (GBusType bus_type,
|
||||
G_IO_ERROR,
|
||||
G_IO_ERROR_INVALID_ARGUMENT,
|
||||
_("Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable"
|
||||
" - unknown value '%s'"),
|
||||
" — unknown value “%s”"),
|
||||
starter_bus);
|
||||
}
|
||||
else
|
||||
|
||||
@ -1931,8 +1931,8 @@ set_overrides (GHashTable *schema_table,
|
||||
|
||||
if (state == NULL)
|
||||
{
|
||||
fprintf (stderr, _("No such key '%s' in schema '%s' as "
|
||||
"specified in override file '%s'"),
|
||||
fprintf (stderr, _("No such key “%s” in schema “%s” as "
|
||||
"specified in override file “%s”"),
|
||||
key, group, filename);
|
||||
|
||||
if (!strict)
|
||||
@ -1957,8 +1957,8 @@ set_overrides (GHashTable *schema_table,
|
||||
|
||||
if (value == NULL)
|
||||
{
|
||||
fprintf (stderr, _("error parsing key '%s' in schema '%s' "
|
||||
"as specified in override file '%s': "
|
||||
fprintf (stderr, _("error parsing key “%s” in schema “%s” "
|
||||
"as specified in override file “%s”: "
|
||||
"%s."),
|
||||
key, group, filename, error->message);
|
||||
|
||||
@ -1985,8 +1985,8 @@ set_overrides (GHashTable *schema_table,
|
||||
g_variant_compare (value, state->maximum) > 0)
|
||||
{
|
||||
fprintf (stderr,
|
||||
_("override for key '%s' in schema '%s' in "
|
||||
"override file '%s' is outside the range "
|
||||
_("override for key “%s” in schema “%s” in "
|
||||
"override file “%s” is outside the range "
|
||||
"given in the schema"),
|
||||
key, group, filename);
|
||||
|
||||
@ -2013,8 +2013,8 @@ set_overrides (GHashTable *schema_table,
|
||||
if (!is_valid_choices (value, state->strinfo))
|
||||
{
|
||||
fprintf (stderr,
|
||||
_("override for key '%s' in schema '%s' in "
|
||||
"override file '%s' is not in the list "
|
||||
_("override for key “%s” in schema “%s” in "
|
||||
"override file “%s” is not in the list "
|
||||
"of valid choices"),
|
||||
key, group, filename);
|
||||
|
||||
|
||||
@ -458,7 +458,7 @@ slow_name_validate (GMarkupParseContext *context,
|
||||
if (!g_utf8_validate (name, strlen (name), NULL))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_BAD_UTF8,
|
||||
_("Invalid UTF-8 encoded text in name - not valid '%s'"), name);
|
||||
_("Invalid UTF-8 encoded text in name — not valid “%s”"), name);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -469,7 +469,7 @@ slow_name_validate (GMarkupParseContext *context,
|
||||
g_unichar_isalpha (g_utf8_get_char (p))))))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("'%s' is not a valid name"), name);
|
||||
_("“%s” is not a valid name"), name);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -485,7 +485,7 @@ slow_name_validate (GMarkupParseContext *context,
|
||||
g_unichar_isalpha (g_utf8_get_char (p))))))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("'%s' is not a valid name: '%c'"), name, *p);
|
||||
_("“%s” is not a valid name: “%c”"), name, *p);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@ -541,7 +541,7 @@ text_validate (GMarkupParseContext *context,
|
||||
if (!g_utf8_validate (p, len, NULL))
|
||||
{
|
||||
set_error (context, error, G_MARKUP_ERROR_BAD_UTF8,
|
||||
_("Invalid UTF-8 encoded text in name - not valid '%s'"), p);
|
||||
_("Invalid UTF-8 encoded text in name — not valid “%s”"), p);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
@ -672,10 +672,10 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
{
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Failed to parse '%-.*s', which "
|
||||
_("Failed to parse “%-.*s”, which "
|
||||
"should have been a digit "
|
||||
"inside a character reference "
|
||||
"(ê for example) - perhaps "
|
||||
"(ê for example) — perhaps "
|
||||
"the digit is too large"),
|
||||
(int)(end - from), from);
|
||||
return FALSE;
|
||||
@ -688,7 +688,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
"semicolon; "
|
||||
"most likely you used an ampersand "
|
||||
"character without intending to start "
|
||||
"an entity - escape ampersand as &"));
|
||||
"an entity — escape ampersand as &"));
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
@ -710,7 +710,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
{
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Character reference '%-.*s' does not "
|
||||
_("Character reference “%-.*s” does not "
|
||||
"encode a permitted character"),
|
||||
(int)(end - from), from);
|
||||
return FALSE;
|
||||
@ -748,7 +748,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
if (*from == ';')
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Empty entity '&;' seen; valid "
|
||||
_("Empty entity “&;” seen; valid "
|
||||
"entities are: & " < > '"));
|
||||
else
|
||||
{
|
||||
@ -756,7 +756,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
if (end)
|
||||
set_unescape_error (context, error,
|
||||
from, G_MARKUP_ERROR_PARSE,
|
||||
_("Entity name '%-.*s' is not known"),
|
||||
_("Entity name “%-.*s” is not known"),
|
||||
(int)(end - from), from);
|
||||
else
|
||||
set_unescape_error (context, error,
|
||||
@ -764,7 +764,7 @@ unescape_gstring_inplace (GMarkupParseContext *context,
|
||||
_("Entity did not end with a semicolon; "
|
||||
"most likely you used an ampersand "
|
||||
"character without intending to start "
|
||||
"an entity - escape ampersand as &"));
|
||||
"an entity — escape ampersand as &"));
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
@ -1207,8 +1207,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("'%s' is not a valid character following "
|
||||
"a '<' character; it may not begin an "
|
||||
_("“%s” is not a valid character following "
|
||||
"a “<” character; it may not begin an "
|
||||
"element name"),
|
||||
utf8_str (context->iter, buf));
|
||||
}
|
||||
@ -1249,8 +1249,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character '%s', expected a '>' character "
|
||||
"to end the empty-element tag '%s'"),
|
||||
_("Odd character “%s”, expected a “>” character "
|
||||
"to end the empty-element tag “%s”"),
|
||||
utf8_str (context->iter, buf),
|
||||
current_element (context));
|
||||
}
|
||||
@ -1330,8 +1330,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character '%s', expected a '=' after "
|
||||
"attribute name '%s' of element '%s'"),
|
||||
_("Odd character “%s”, expected a “=” after "
|
||||
"attribute name “%s” of element “%s”"),
|
||||
utf8_str (context->iter, buf),
|
||||
current_attribute (context),
|
||||
current_element (context));
|
||||
@ -1371,9 +1371,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character '%s', expected a '>' or '/' "
|
||||
_("Odd character “%s”, expected a “>” or “/” "
|
||||
"character to end the start tag of "
|
||||
"element '%s', or optionally an attribute; "
|
||||
"element “%s”, or optionally an attribute; "
|
||||
"perhaps you used an invalid character in "
|
||||
"an attribute name"),
|
||||
utf8_str (context->iter, buf),
|
||||
@ -1415,9 +1415,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Odd character '%s', expected an open quote mark "
|
||||
_("Odd character “%s”, expected an open quote mark "
|
||||
"after the equals sign when giving value for "
|
||||
"attribute '%s' of element '%s'"),
|
||||
"attribute “%s” of element “%s”"),
|
||||
utf8_str (context->iter, buf),
|
||||
current_attribute (context),
|
||||
current_element (context));
|
||||
@ -1548,8 +1548,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("'%s' is not a valid character following "
|
||||
"the characters '</'; '%s' may not begin an "
|
||||
_("“%s” is not a valid character following "
|
||||
"the characters “</”; “%s” may not begin an "
|
||||
"element name"),
|
||||
utf8_str (context->iter, buf),
|
||||
utf8_str (context->iter, buf));
|
||||
@ -1584,9 +1584,9 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("'%s' is not a valid character following "
|
||||
"the close element name '%s'; the allowed "
|
||||
"character is '>'"),
|
||||
_("“%s” is not a valid character following "
|
||||
"the close element name “%s”; the allowed "
|
||||
"character is “>”"),
|
||||
utf8_str (context->iter, buf),
|
||||
close_name->str);
|
||||
}
|
||||
@ -1595,7 +1595,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Element '%s' was closed, no element "
|
||||
_("Element “%s” was closed, no element "
|
||||
"is currently open"),
|
||||
close_name->str);
|
||||
}
|
||||
@ -1604,8 +1604,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error (context,
|
||||
error,
|
||||
G_MARKUP_ERROR_PARSE,
|
||||
_("Element '%s' was closed, but the currently "
|
||||
"open element is '%s'"),
|
||||
_("Element “%s” was closed, but the currently "
|
||||
"open element is “%s”"),
|
||||
close_name->str,
|
||||
current_element (context));
|
||||
}
|
||||
@ -1771,7 +1771,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
|
||||
case STATE_AFTER_OPEN_ANGLE:
|
||||
set_error_literal (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly just after an open angle bracket '<'"));
|
||||
_("Document ended unexpectedly just after an open angle bracket “<”"));
|
||||
break;
|
||||
|
||||
case STATE_AFTER_CLOSE_ANGLE:
|
||||
@ -1779,8 +1779,8 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
{
|
||||
/* Error message the same as for INSIDE_TEXT */
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly with elements still open - "
|
||||
"'%s' was the last element opened"),
|
||||
_("Document ended unexpectedly with elements still open — "
|
||||
"“%s” was the last element opened"),
|
||||
current_element (context));
|
||||
}
|
||||
break;
|
||||
@ -1824,8 +1824,8 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
case STATE_INSIDE_TEXT:
|
||||
g_assert (context->tag_stack != NULL);
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly with elements still open - "
|
||||
"'%s' was the last element opened"),
|
||||
_("Document ended unexpectedly with elements still open — "
|
||||
"“%s” was the last element opened"),
|
||||
current_element (context));
|
||||
break;
|
||||
|
||||
@ -1834,7 +1834,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
case STATE_AFTER_CLOSE_TAG_NAME:
|
||||
set_error (context, error, G_MARKUP_ERROR_PARSE,
|
||||
_("Document ended unexpectedly inside the close tag for "
|
||||
"element '%s'"), current_element (context));
|
||||
"element “%s”"), current_element (context));
|
||||
break;
|
||||
|
||||
case STATE_INSIDE_PASSTHROUGH:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user