diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 96412cbda..8977c671a 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -4106,7 +4106,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); @@ -4248,7 +4248,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); @@ -4260,7 +4260,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); @@ -4271,7 +4271,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); @@ -4291,7 +4291,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); @@ -4396,7 +4396,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); @@ -4453,7 +4453,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); @@ -4822,7 +4822,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); @@ -4920,7 +4920,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); @@ -4951,7 +4951,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); @@ -5607,7 +5607,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); @@ -6570,7 +6570,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); @@ -6681,7 +6681,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)); @@ -7079,7 +7079,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); @@ -7131,7 +7131,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 diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c index 8d1fdfb1f..833ae6bb0 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c @@ -791,7 +791,7 @@ is_valid_keyname (const gchar *key, if (!g_ascii_islower (key[0])) { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("invalid name “%s”: names must begin " + _("invalid name '%s': names must begin " "with a lowercase letter"), key); return FALSE; } @@ -803,8 +803,8 @@ is_valid_keyname (const gchar *key, !g_ascii_isdigit (key[i])) { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("invalid name “%s”: invalid character “%c”; " - "only lowercase letters, numbers and hyphen (“-”) " + _("invalid name '%s': invalid character '%c'; " + "only lowercase letters, numbers and hyphen ('-') " "are permitted."), key, key[i]); return FALSE; } @@ -812,7 +812,7 @@ is_valid_keyname (const gchar *key, if (key[i] == '-' && key[i + 1] == '-') { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("invalid name “%s”: two successive hyphens (“--”) " + _("invalid name '%s': two successive hyphens ('--') " "are not permitted."), key); return FALSE; } @@ -821,15 +821,15 @@ is_valid_keyname (const gchar *key, if (key[i - 1] == '-') { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("invalid name “%s”: the last character may not be a " - "hyphen (“-”)."), key); + _("invalid name '%s': the last character may not be a " + "hyphen ('-')."), key); return FALSE; } if (i > 1024) { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("invalid name “%s”: maximum length is 1024"), key); + _("invalid name '%s': maximum length is 1024"), key); return FALSE; } @@ -924,7 +924,7 @@ schema_state_add_key (SchemaState *state, { g_set_error_literal (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("cannot add keys to a “list-of” schema")); + _("cannot add keys to a 'list-of' schema")); return NULL; } @@ -964,7 +964,7 @@ schema_state_add_key (SchemaState *state, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_MISSING_ATTRIBUTE, - _("exactly one of “type”, “enum” or “flags” must " + _("exactly one of 'type', 'enum' or 'flags' must " "be specified as an attribute to ")); return NULL; } @@ -998,7 +998,7 @@ schema_state_add_key (SchemaState *state, { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("invalid GVariant type string “%s”"), type_string); + _("invalid GVariant type string '%s'"), type_string); return NULL; } @@ -1028,7 +1028,7 @@ schema_state_add_override (SchemaState *state, { g_set_error_literal (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _(" given but schema isn’t " + _(" given but schema isn't " "extending anything")); return; } @@ -1135,7 +1135,7 @@ 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); + "schema '%s'"), id, extends_name); return; } } @@ -1151,7 +1151,7 @@ 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); + "schema '%s'"), id, list_of); return; } @@ -1189,8 +1189,8 @@ parse_state_start_schema (ParseState *state, g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, _(" extends but “%s” does not " - "extend “%s”"), id, list_of, extends_name, + "id='%s' list-of='%s'> but '%s' does not " + "extend '%s'"), id, list_of, extends_name, extends->list_of, list_of, extends->list_of); return; } @@ -1212,7 +1212,7 @@ parse_state_start_schema (ParseState *state, if (path && list_of && !g_str_has_suffix (path, ":/")) { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("the path of a list must end with “:/”")); + _("the path of a list must end with ':/'")); return; } @@ -1898,8 +1898,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) @@ -1924,8 +1924,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); @@ -1952,8 +1952,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); @@ -1980,8 +1980,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); diff --git a/glib/gmarkup.c b/glib/gmarkup.c index dc828d531..04ce6e58d 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -459,7 +459,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; } @@ -470,7 +470,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; } @@ -486,7 +486,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; } } @@ -542,7 +542,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 @@ -673,10 +673,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; @@ -689,7 +689,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 @@ -711,7 +711,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; @@ -749,7 +749,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 { @@ -757,7 +757,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, @@ -765,7 +765,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; } @@ -1208,8 +1208,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)); } @@ -1250,8 +1250,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)); } @@ -1331,8 +1331,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)); @@ -1372,9 +1372,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), @@ -1416,9 +1416,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)); @@ -1549,8 +1549,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 “iter, buf), utf8_str (context->iter, buf)); @@ -1585,9 +1585,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); } @@ -1596,7 +1596,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); } @@ -1605,8 +1605,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)); } @@ -1772,7 +1772,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: @@ -1780,8 +1780,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; @@ -1825,8 +1825,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; @@ -1835,7 +1835,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: