diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index ae463e430989e45d35081a235c72e882141ab8fb..09b782e46bc6f5d88bfcb6c95f6ae4a3730212ce 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -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
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index f6e1b4036ab2d76be67ff9e2beb636c52a6d964d..6794ca910778eb506924121f2af76e0a0d9889a9 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -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);
 
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index ed30ed297b3751199e20681b30020f537ed97d84..372b3a9b288c818ecb8e81c78d2451f1956b1030 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -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:
diff --git a/glib/tests/markups/fail-10.expected b/glib/tests/markups/fail-10.expected
index 7761a226244c023344b3e02ef320176154d9e660..6462cdf8cba19c6106acfc929fac5d2e86ad4717 100644
--- a/glib/tests/markups/fail-10.expected
+++ b/glib/tests/markups/fail-10.expected
@@ -1,4 +1,4 @@
 ELEMENT 'foo'
   TEXT '
 '
-ERROR Error on line 2 char 8: Element '|foo' was closed, but the currently open element is 'foo'
+ERROR Error on line 2 char 8: Element “|foo” was closed, but the currently open element is “foo”
diff --git a/glib/tests/markups/fail-11.expected b/glib/tests/markups/fail-11.expected
index 3a7173d37fa3bc673bfa7e7b4708fc9dadc09eab..f2331b79634da7cf50e266911c61ccae52f71523 100644
--- a/glib/tests/markups/fail-11.expected
+++ b/glib/tests/markups/fail-11.expected
@@ -4,4 +4,4 @@ ELEMENT 'foo'
   ELEMENT 'bar'
     TEXT '
 '
-ERROR Error on line 3 char 7: Element 'foo' was closed, but the currently open element is 'bar'
+ERROR Error on line 3 char 7: Element “foo” was closed, but the currently open element is “bar”
diff --git a/glib/tests/markups/fail-12.expected b/glib/tests/markups/fail-12.expected
index 0aab7b5f1dd8f84741e8c5bcb5a4301738d89059..c4176b08af67618c275cf5c0944f78f3874c49d2 100644
--- a/glib/tests/markups/fail-12.expected
+++ b/glib/tests/markups/fail-12.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 6: Element 'foo' was closed, no element is currently open
+ERROR Error on line 1 char 6: Element “foo” was closed, no element is currently open
diff --git a/glib/tests/markups/fail-13.expected b/glib/tests/markups/fail-13.expected
index 60157fa4ad69450a56c341a0daf7b268fd4babb5..b2cdf9f46ad6585c765ffe0de6a300e1ac95a840 100644
--- a/glib/tests/markups/fail-13.expected
+++ b/glib/tests/markups/fail-13.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 7: Element 'foo|' was closed, no element is currently open
+ERROR Error on line 1 char 7: Element “foo|” was closed, no element is currently open
diff --git a/glib/tests/markups/fail-14.expected b/glib/tests/markups/fail-14.expected
index 47e6847cc36cb93afddbdcff7285fc77fe79be86..2f0d64140033e17db9b9e6725ed9f2ad7d762783 100644
--- a/glib/tests/markups/fail-14.expected
+++ b/glib/tests/markups/fail-14.expected
@@ -1,4 +1,4 @@
 ELEMENT 'foo'
   TEXT '
 '
-ERROR Error on line 2 char 3: Document ended unexpectedly just after an open angle bracket '<'
+ERROR Error on line 2 char 3: Document ended unexpectedly just after an open angle bracket “<”
diff --git a/glib/tests/markups/fail-15.expected b/glib/tests/markups/fail-15.expected
index 380ab74d85c7d384d034cc3402815ffa6ab0b9a7..5b31870d46162f6eca1de0da0c6836175dd444f9 100644
--- a/glib/tests/markups/fail-15.expected
+++ b/glib/tests/markups/fail-15.expected
@@ -5,4 +5,4 @@ ELEMENT 'foo'
     TEXT '
 '
   END 'bar'
-ERROR Error on line 3 char 8: Document ended unexpectedly with elements still open - 'foo' was the last element opened
+ERROR Error on line 3 char 8: Document ended unexpectedly with elements still open — “foo” was the last element opened
diff --git a/glib/tests/markups/fail-22.expected b/glib/tests/markups/fail-22.expected
index b9585de1822260e9a2fa0dae8444ba1765d53d74..a238253d071ed36a7fd94e73f2dbab556ec0f993 100644
--- a/glib/tests/markups/fail-22.expected
+++ b/glib/tests/markups/fail-22.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1 char 6: Document ended unexpectedly with elements still open - 'foo' was the last element opened
+ERROR Error on line 1 char 6: Document ended unexpectedly with elements still open — “foo” was the last element opened
diff --git a/glib/tests/markups/fail-26.expected b/glib/tests/markups/fail-26.expected
index 99ab934bb59f1b29d9693c7ca6e102e46325ec8e..69392f093359c0ede47643d30f362825f597ed02 100644
--- a/glib/tests/markups/fail-26.expected
+++ b/glib/tests/markups/fail-26.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;
+ERROR Error on line 1: Empty entity “&;” seen; valid entities are: &amp; &quot; &lt; &gt; &apos;
diff --git a/glib/tests/markups/fail-27.expected b/glib/tests/markups/fail-27.expected
index 3090f33f95adb33cfea638cad188af4e82100451..8d70804ed7ebcfc0660df534536a99e425238f21 100644
--- a/glib/tests/markups/fail-27.expected
+++ b/glib/tests/markups/fail-27.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity name '|' is not known
+ERROR Error on line 1: Entity name “|” is not known
diff --git a/glib/tests/markups/fail-28.expected b/glib/tests/markups/fail-28.expected
index e54ab6615ec2730b0de6397eed7fb594f15c0740..fa1171c66f8a26caaf9b61be98a0323bc855caa9 100644
--- a/glib/tests/markups/fail-28.expected
+++ b/glib/tests/markups/fail-28.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity name 'am|' is not known
+ERROR Error on line 1: Entity name “am|” is not known
diff --git a/glib/tests/markups/fail-29.expected b/glib/tests/markups/fail-29.expected
index ddc0090cc091143630375611e240ab0d3e54f209..d4159614308b20e3d0e23d17ba1a3e6eefb7847c 100644
--- a/glib/tests/markups/fail-29.expected
+++ b/glib/tests/markups/fail-29.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity name 'bar' is not known
+ERROR Error on line 1: Entity name “bar” is not known
diff --git a/glib/tests/markups/fail-3.expected b/glib/tests/markups/fail-3.expected
index e39f81c9a401d5995375163dc529b5dba112f9e4..dcb2a02a48f86ea6d1437fb1d76b707a9b29e0a1 100644
--- a/glib/tests/markups/fail-3.expected
+++ b/glib/tests/markups/fail-3.expected
@@ -1,5 +1,5 @@
 ELEMENT 'foobar'
-ERROR Error on line 49 char 2: Invalid UTF-8 encoded text in name - not valid '
+ERROR Error on line 49 char 2: Invalid UTF-8 encoded text in name — not valid “
 Παν語
 
 This is a list of ways to say hello in various languages. Its purpose is to illustrate a number of scripts.
@@ -47,4 +47,4 @@ Difference among chinese characters in GB, JIS, KSC, BIG5:‎
  BIG5	--	元氣	開發
 
 
-'
+”
diff --git a/glib/tests/markups/fail-30.expected b/glib/tests/markups/fail-30.expected
index 15169e35fd8ba286e8ed16a9c59662fecb74c451..fc8c6eb74df5bdd175937a34db0e762861843ac8 100644
--- a/glib/tests/markups/fail-30.expected
+++ b/glib/tests/markups/fail-30.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-31.expected b/glib/tests/markups/fail-31.expected
index a17ae976c0e94ddb78d211d1f653a06b562a2660..67c0190d513f5ca478c1233e6fc32d46e561f6af 100644
--- a/glib/tests/markups/fail-31.expected
+++ b/glib/tests/markups/fail-31.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Failed to parse '34592348345343453453455645765736575865767', which should have been a digit inside a character reference (&#234; for example) - perhaps the digit is too large
+ERROR Error on line 1: Failed to parse “34592348345343453453455645765736575865767”, which should have been a digit inside a character reference (&#234; for example) — perhaps the digit is too large
diff --git a/glib/tests/markups/fail-32.expected b/glib/tests/markups/fail-32.expected
index c3d9c45af43115fabfde8533c965746cd367ac0c..564dd41d5cbed4e7b055dd1b428ead059f25f1ca 100644
--- a/glib/tests/markups/fail-32.expected
+++ b/glib/tests/markups/fail-32.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Character reference '0' does not encode a permitted character
+ERROR Error on line 1: Character reference “0” does not encode a permitted character
diff --git a/glib/tests/markups/fail-33.expected b/glib/tests/markups/fail-33.expected
index c4854633ccc7400f0c37f4157e30ec7e63dd6bdc..e84ed71d1c5f9d2deef3bf1b626ff43012e7716e 100644
--- a/glib/tests/markups/fail-33.expected
+++ b/glib/tests/markups/fail-33.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Failed to parse '', which should have been a digit inside a character reference (&#234; for example) - perhaps the digit is too large
+ERROR Error on line 1: Failed to parse “”, which should have been a digit inside a character reference (&#234; for example) — perhaps the digit is too large
diff --git a/glib/tests/markups/fail-34.expected b/glib/tests/markups/fail-34.expected
index 7fac38c00fcf8e8cdfa42e67e7bce9bc883a4c69..4cb1363c8fa3bfc7cf9d75f81d9499b747cfc5cd 100644
--- a/glib/tests/markups/fail-34.expected
+++ b/glib/tests/markups/fail-34.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Character reference did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 1: Character reference did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-35.expected b/glib/tests/markups/fail-35.expected
index 15169e35fd8ba286e8ed16a9c59662fecb74c451..fc8c6eb74df5bdd175937a34db0e762861843ac8 100644
--- a/glib/tests/markups/fail-35.expected
+++ b/glib/tests/markups/fail-35.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-36.expected b/glib/tests/markups/fail-36.expected
index 2bd9fbb7f3ed9e0ecca1354e117427a33f749ab8..3f806dcf3cbcb2adb7da58fcc191ad679c935da4 100644
--- a/glib/tests/markups/fail-36.expected
+++ b/glib/tests/markups/fail-36.expected
@@ -1,4 +1,4 @@
 ELEMENT 'foo'
   TEXT '�'
 END 'foo'
-ERROR Error on line 2 char 1: '^$non-carriage-null-fail|' is not a valid name
+ERROR Error on line 2 char 1: “^$non-carriage-null-fail|” is not a valid name
diff --git a/glib/tests/markups/fail-37.expected b/glib/tests/markups/fail-37.expected
index f04ec35569e29a9ded30a70452fce95a5a5736bb..edc683eccf9280618bd885f90ac07f79d3f86289 100644
--- a/glib/tests/markups/fail-37.expected
+++ b/glib/tests/markups/fail-37.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 2: ' ' is not a valid character following a '<' character; it may not begin an element name
+ERROR Error on line 1 char 2: “ ” is not a valid character following a “<” character; it may not begin an element name
diff --git a/glib/tests/markups/fail-38.expected b/glib/tests/markups/fail-38.expected
index f25b4cdd20f6ca57f7bc3240bf7c95df5a1c32e4..3a5f865095d544b96a8a7300d86fc370da0410f9 100644
--- a/glib/tests/markups/fail-38.expected
+++ b/glib/tests/markups/fail-38.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT 'data'
-ERROR Error on line 1 char 11: ' ' is not a valid character following a '<' character; it may not begin an element name
+ERROR Error on line 1 char 11: “ ” is not a valid character following a “<” character; it may not begin an element name
diff --git a/glib/tests/markups/fail-39.expected b/glib/tests/markups/fail-39.expected
index de0e4b8dbf0a7205576c3282f4449bae86eff74f..1b5d234a3e63d1153f24def39f3dbcf420d279bb 100644
--- a/glib/tests/markups/fail-39.expected
+++ b/glib/tests/markups/fail-39.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT 'data'
-ERROR Error on line 1 char 12: ' ' is not a valid character following the characters '</'; ' ' may not begin an element name
+ERROR Error on line 1 char 12: “ ” is not a valid character following the characters “</”; “ ” may not begin an element name
diff --git a/glib/tests/markups/fail-40.expected b/glib/tests/markups/fail-40.expected
index a2b5cbcb8417f9db539190e0f4d763ee1e4b8c58..144c89ceb3ebfc4e55c58c6399d9f9959c5d4adf 100644
--- a/glib/tests/markups/fail-40.expected
+++ b/glib/tests/markups/fail-40.expected
@@ -1,2 +1,2 @@
 ELEMENT 'bla'
-ERROR Error on line 1: Entity name 'unknownentityname' is not known
+ERROR Error on line 1: Entity name “unknownentityname” is not known
diff --git a/glib/tests/markups/fail-41.expected b/glib/tests/markups/fail-41.expected
index ab476eff2cf15d2d2b7926e2d95ac3c6e044ee63..33ca9fbe41be3b6f52864a4397349092a0262a82 100644
--- a/glib/tests/markups/fail-41.expected
+++ b/glib/tests/markups/fail-41.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 1: Invalid UTF-8 encoded text in name - not valid 'abc���'
+ERROR Error on line 2 char 1: Invalid UTF-8 encoded text in name — not valid “abc���”
diff --git a/glib/tests/markups/fail-42.expected b/glib/tests/markups/fail-42.expected
index 4fbf6858cac9c4707de6aa085a9e3f752268de33..dbdc09f13ee1808dbcf68da081613069327ee923 100644
--- a/glib/tests/markups/fail-42.expected
+++ b/glib/tests/markups/fail-42.expected
@@ -1 +1 @@
-ERROR Error on line 3: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &amp;
+ERROR Error on line 3: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity — escape ampersand as &amp;
diff --git a/glib/tests/markups/fail-43.expected b/glib/tests/markups/fail-43.expected
index 57a7b02c3f3173b520d1147a23105f27dfc3c1ed..64b42c24c0a089a770e753dcd17875329d0c9c8d 100644
--- a/glib/tests/markups/fail-43.expected
+++ b/glib/tests/markups/fail-43.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 10: Odd character '≈', expected a '=' after attribute name 'bar' of element 'foo'
+ERROR Error on line 1 char 10: Odd character “≈”, expected a “=” after attribute name “bar” of element “foo”
diff --git a/glib/tests/markups/fail-44.expected b/glib/tests/markups/fail-44.expected
index 533eef7fbb0f59cbd40f4392f6edc52442f9758f..0cddd72e8f037c90a07d79f292a145d58f552fb0 100644
--- a/glib/tests/markups/fail-44.expected
+++ b/glib/tests/markups/fail-44.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1 char 6: Odd character '≻', expected a '>' character to end the empty-element tag 'foo'
+ERROR Error on line 1 char 6: Odd character “≻”, expected a “>” character to end the empty-element tag “foo”
diff --git a/glib/tests/markups/fail-45.expected b/glib/tests/markups/fail-45.expected
index 866b751333acb4e45a4685568756c92c4a3f8223..1899cdf5de2c6ab6d831f1efe9a782160d34d608 100644
--- a/glib/tests/markups/fail-45.expected
+++ b/glib/tests/markups/fail-45.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT ''
-ERROR Error on line 1 char 12: '≻' is not a valid character following the close element name 'foo'; the allowed character is '>'
+ERROR Error on line 1 char 12: “≻” is not a valid character following the close element name “foo”; the allowed character is “>”
diff --git a/glib/tests/markups/fail-46.expected b/glib/tests/markups/fail-46.expected
index f3ab8ca901c528b6fca20fe544aa211c39f2b604..7124919a2ca3ddd52053a079b8677ca6d683483d 100644
--- a/glib/tests/markups/fail-46.expected
+++ b/glib/tests/markups/fail-46.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 3 char 2: Document ended unexpectedly with elements still open - 'foo' was the last element opened
+ERROR Error on line 3 char 2: Document ended unexpectedly with elements still open — “foo” was the last element opened
diff --git a/glib/tests/markups/fail-47.expected b/glib/tests/markups/fail-47.expected
index 89dc4b4004c738f82fb9e025ad42c3dfd7794558..1083489f83c7cf5823bf350d41e4c9499fd447bb 100644
--- a/glib/tests/markups/fail-47.expected
+++ b/glib/tests/markups/fail-47.expected
@@ -1 +1 @@
-ERROR Error on line 1: Failed to parse '', which should have been a digit inside a character reference (&#234; for example) - perhaps the digit is too large
+ERROR Error on line 1: Failed to parse “”, which should have been a digit inside a character reference (&#234; for example) — perhaps the digit is too large
diff --git a/glib/tests/markups/fail-48.expected b/glib/tests/markups/fail-48.expected
index e5fa7400434dfc32800aeded9367bb7e6df8f074..ed546bf7017c9d5a13da2942545456a48e60e1b4 100644
--- a/glib/tests/markups/fail-48.expected
+++ b/glib/tests/markups/fail-48.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 2: Odd character '>', expected a '=' after attribute name 'bar' of element 'fail'
+ERROR Error on line 2 char 2: Odd character “>”, expected a “=” after attribute name “bar” of element “fail”
diff --git a/glib/tests/markups/fail-49.expected b/glib/tests/markups/fail-49.expected
index fc3bacb577f47bada20e477536436a9edabce8ab..386e1a41553d5c2fa5e23ee005f4bb457635a369 100644
--- a/glib/tests/markups/fail-49.expected
+++ b/glib/tests/markups/fail-49.expected
@@ -1,3 +1,3 @@
 ELEMENT 'foo'
   TEXT ''
-ERROR Error on line 2 char 2: Document ended unexpectedly inside the close tag for element 'foo'
+ERROR Error on line 2 char 2: Document ended unexpectedly inside the close tag for element “foo”
diff --git a/glib/tests/markups/fail-5.expected b/glib/tests/markups/fail-5.expected
index e519015d5a3649c5c469dba8e35a60ff468cf4c3..0105827f00020dd844cf59b85935f1402450458e 100644
--- a/glib/tests/markups/fail-5.expected
+++ b/glib/tests/markups/fail-5.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 1: '|foo' is not a valid name
+ERROR Error on line 2 char 1: “|foo” is not a valid name
diff --git a/glib/tests/markups/fail-6.expected b/glib/tests/markups/fail-6.expected
index b722468881e186f8f641a73b88a5fe06824ed5c3..d41f00e744de4678e0db4ceab3d0b918e0e23f49 100644
--- a/glib/tests/markups/fail-6.expected
+++ b/glib/tests/markups/fail-6.expected
@@ -1 +1 @@
-ERROR Error on line 2 char 1: 'foo|' is not a valid name: '|'
+ERROR Error on line 2 char 1: “foo|” is not a valid name: “|”
diff --git a/glib/tests/markups/fail-7.expected b/glib/tests/markups/fail-7.expected
index 40b61c1520878352bf85dbf04e6ced16675bebbd..a2843cd727dd651a7d6f4e6d4009a13d2e552b1b 100644
--- a/glib/tests/markups/fail-7.expected
+++ b/glib/tests/markups/fail-7.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 15: 'bar}"baz"' is not a valid name: '}'
+ERROR Error on line 1 char 15: “bar}"baz"” is not a valid name: “}”
diff --git a/glib/tests/markups/fail-8.expected b/glib/tests/markups/fail-8.expected
index 31651aa6b90b6020a730720fd548bffb8ae4b4e1..121163d8e4e9065caa45503aa84db583c6efbb7f 100644
--- a/glib/tests/markups/fail-8.expected
+++ b/glib/tests/markups/fail-8.expected
@@ -1,2 +1,2 @@
 ELEMENT 'foo'
-ERROR Error on line 1 char 6: Odd character '}', expected a '>' character to end the empty-element tag 'foo'
+ERROR Error on line 1 char 6: Odd character “}”, expected a “>” character to end the empty-element tag “foo”
diff --git a/glib/tests/markups/fail-9.expected b/glib/tests/markups/fail-9.expected
index 9994eb3456a7eba7e0994d5daa988a677ef2806c..f2d77cca69af9d3e2710b35aa57f0bd7fa386540 100644
--- a/glib/tests/markups/fail-9.expected
+++ b/glib/tests/markups/fail-9.expected
@@ -1 +1 @@
-ERROR Error on line 1 char 10: Odd character '{', expected an open quote mark after the equals sign when giving value for attribute 'bar' of element 'foo'
+ERROR Error on line 1 char 10: Odd character “{”, expected an open quote mark after the equals sign when giving value for attribute “bar” of element “foo”