diff --git a/glib/tests/markups/fail-10.expected b/glib/tests/markups/fail-10.expected
index 7761a2262..6462cdf8c 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 3a7173d37..f2331b796 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 0aab7b5f1..c4176b08a 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 60157fa4a..b2cdf9f46 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 47e6847cc..2f0d64140 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 380ab74d8..5b31870d4 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 b9585de18..a238253d0 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 99ab934bb..69392f093 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 3090f33f9..8d70804ed 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 e54ab6615..fa1171c66 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 ddc0090cc..d41596143 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 e39f81c9a..dcb2a02a4 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 15169e35f..fc8c6eb74 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 a17ae976c..67c0190d5 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 c3d9c45af..564dd41d5 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 c4854633c..e84ed71d1 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 7fac38c00..4cb1363c8 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 15169e35f..fc8c6eb74 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 2bd9fbb7f..3f806dcf3 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 f04ec3556..edc683ecc 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 f25b4cdd2..3a5f86509 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 de0e4b8db..1b5d234a3 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 a2b5cbcb8..144c89ceb 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 ab476eff2..33ca9fbe4 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 4fbf6858c..dbdc09f13 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 57a7b02c3..64b42c24c 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 533eef7fb..0cddd72e8 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 866b75133..1899cdf5d 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 f3ab8ca90..7124919a2 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 89dc4b400..1083489f8 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 e5fa74004..ed546bf70 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 fc3bacb57..386e1a415 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 e519015d5..0105827f0 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 b72246888..d41f00e74 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 40b61c152..a2843cd72 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 31651aa6b..121163d8e 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 9994eb345..f2d77cca6 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”