[glib] Use Unicode in translatable strings



commit 10c490cdfe3ae042f747bd00f787492e2bdb7ed0
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Fri Sep 30 05:47:15 2016 +0200

    Use Unicode in translatable strings
    
    See https://developer.gnome.org/hig/stable/typography.html
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772221

 gio/gapplication-tool.c      |   14 ++++----
 gio/gapplication.c           |    2 +-
 gio/gcharsetconverter.c      |    4 +-
 gio/gdbus-tool.c             |   10 +++---
 gio/gdbusaddress.c           |   48 ++++++++++++++--------------
 gio/gdbusauthmechanismsha1.c |   34 ++++++++++----------
 gio/gdbusconnection.c        |   30 +++++++++---------
 gio/gdbusmessage.c           |   30 +++++++++---------
 gio/gdbusserver.c            |    6 ++--
 gio/gdesktopappinfo.c        |    8 ++--
 gio/gdrive.c                 |   10 +++---
 gio/gdtlsconnection.c        |    6 ++--
 gio/gemblem.c                |    4 +-
 gio/gemblemedicon.c          |    2 +-
 gio/gfile.c                  |   14 ++++----
 gio/gfileicon.c              |    2 +-
 gio/gfileinputstream.c       |    4 +-
 gio/gfileiostream.c          |    2 +-
 gio/gfileoutputstream.c      |    4 +-
 gio/gicon.c                  |    2 +-
 gio/ginetaddressmask.c       |    2 +-
 gio/ginputstream.c           |    2 +-
 gio/gio-tool-copy.c          |    2 +-
 gio/gio-tool-info.c          |    4 +-
 gio/gio-tool-list.c          |    2 +-
 gio/gio-tool-mime.c          |    8 ++--
 gio/gio-tool-monitor.c       |    2 +-
 gio/gio-tool-move.c          |    4 +-
 gio/gio-tool-set.c           |    2 +-
 gio/gio-tool.c               |    4 +-
 gio/glib-compile-resources.c |   10 +++---
 gio/glib-compile-schemas.c   |   48 ++++++++++++++--------------
 gio/glocalfile.c             |    8 ++--
 gio/glocalfileinfo.c         |    4 +-
 gio/glocalfileoutputstream.c |    8 ++--
 gio/gmount.c                 |   14 ++++----
 gio/gnetworkaddress.c        |    2 +-
 gio/goutputstream.c          |    4 +-
 gio/gproxyaddress.c          |    2 +-
 gio/gresolver.c              |    2 +-
 gio/gresource-tool.c         |    4 +-
 gio/gresource.c              |   16 +++++-----
 gio/gresourcefile.c          |   10 +++---
 gio/gsettings-tool.c         |   16 +++++-----
 gio/gsettings.c              |    2 +-
 gio/gsocketclient.c          |    4 +-
 gio/gsocks4aproxy.c          |    4 +-
 gio/gsocks5proxy.c           |    4 +-
 gio/gsubprocess.c            |    2 +-
 gio/gthemedicon.c            |    4 +-
 gio/gthreadedresolver.c      |   22 ++++++------
 gio/gtlscertificate.c        |    4 +-
 gio/gtlsconnection.c         |    6 ++--
 gio/gvolume.c                |    6 ++--
 glib/gbookmarkfile.c         |   72 +++++++++++++++++++++---------------------
 glib/gconvert.c              |   18 +++++-----
 glib/gdir.c                  |    2 +-
 glib/gfileutils.c            |   36 ++++++++++----------
 glib/giochannel.c            |    8 ++--
 glib/gkeyfile.c              |   52 +++++++++++++++---------------
 glib/gmappedfile.c           |    4 +-
 glib/gmarkup.c               |   70 ++++++++++++++++++++--------------------
 glib/goption.c               |   14 ++++----
 glib/gregex.c                |    8 ++--
 glib/gshell.c                |    8 ++--
 glib/gspawn-win32.c          |    2 +-
 glib/gspawn.c                |    6 ++--
 67 files changed, 387 insertions(+), 387 deletions(-)
---
diff --git a/gio/gapplication-tool.c b/gio/gapplication-tool.c
index 35bdcc9..ef7182e 100644
--- a/gio/gapplication-tool.c
+++ b/gio/gapplication-tool.c
@@ -54,7 +54,7 @@ static const struct help_topic topics[] = {
   },
   { "launch",       N_("Launch an application"),
                     N_("Launch the application (with optional files to open)"),
-                    N_("APPID [FILE...]")
+                    N_("APPID [FILE…]")
   },
   { "action",       N_("Activate an action"),
                     N_("Invoke an action on the application"),
@@ -130,7 +130,7 @@ app_help (gboolean     requested,
       gint maxwidth;
       gint i;
 
-      g_string_append_printf (string, "\n  %s %s %s\n\n", "gapplication", _("COMMAND"), _("[ARGS...]"));
+      g_string_append_printf (string, "\n  %s %s %s\n\n", "gapplication", _("COMMAND"), _("[ARGS…]"));
       g_string_append_printf (string, _("Commands:\n"));
 
       maxwidth = 0;
@@ -143,7 +143,7 @@ app_help (gboolean     requested,
 
       g_string_append (string, "\n");
       /* Translators: do not translate 'help', but please translate 'COMMAND'. */
-      g_string_append_printf (string, _("Use '%s help COMMAND' to get detailed help.\n\n"), "gapplication");
+      g_string_append_printf (string, _("Use “%s help COMMAND” to get detailed help.\n\n"), "gapplication");
     }
 
   if (requested)
@@ -168,7 +168,7 @@ app_check_name (gchar       **args,
 
   if (!g_dbus_is_name (args[0]))
     {
-      g_printerr (_("invalid application id: '%s'\n"), args[0]);
+      g_printerr (_("invalid application id: “%s”\n"), args[0]);
       return FALSE;
     }
 
@@ -179,7 +179,7 @@ static int
 app_no_args (const gchar *command)
 {
   /* Translators: %s is replaced with a command name like 'list-actions' */
-  g_printerr (_("'%s' takes no arguments\n\n"), command);
+  g_printerr (_("“%s” takes no arguments\n\n"), command);
   return app_help (FALSE, command);
 }
 
@@ -322,8 +322,8 @@ app_action (gchar **args)
 
   if (!g_action_name_is_valid (name))
     {
-      g_printerr (_("invalid action name: '%s'\n"
-                    "action names must consist of only alphanumerics, '-' and '.'\n"), name);
+      g_printerr (_("invalid action name: “%s”\n"
+                    "action names must consist of only alphanumerics, “-” and “.”\n"), name);
       return 1;
     }
 
diff --git a/gio/gapplication.c b/gio/gapplication.c
index f0af77b..dbf4812 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -547,7 +547,7 @@ g_application_parse_command_line (GApplication   *application,
     {
       GOptionEntry entries[] = {
         { "gapplication-app-id", '\0', 0, G_OPTION_ARG_STRING, &app_id,
-          N_("Override the application's ID") },
+          N_("Override the application’s ID") },
         { NULL }
       };
 
diff --git a/gio/gcharsetconverter.c b/gio/gcharsetconverter.c
index 86be20e..77e5a23 100644
--- a/gio/gcharsetconverter.c
+++ b/gio/gcharsetconverter.c
@@ -451,11 +451,11 @@ g_charset_converter_initable_init (GInitable     *initable,
     {
       if (errno == EINVAL)
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                    _("Conversion from character set '%s' to '%s' is not supported"),
+                    _("Conversion from character set “%s” to “%s” is not supported"),
                     conv->from, conv->to);
       else
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                    _("Could not open converter from '%s' to '%s'"),
+                    _("Could not open converter from “%s” to “%s”"),
                     conv->from, conv->to);
       return FALSE;
     }
diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c
index dc70b67..7503528 100644
--- a/gio/gdbus-tool.c
+++ b/gio/gdbus-tool.c
@@ -99,7 +99,7 @@ usage (gint *argc, gchar **argv[], gboolean use_stdout)
                          "  call         Invoke a method on a remote object\n"
                          "  emit         Emit a signal\n"
                          "\n"
-                         "Use \"%s COMMAND --help\" to get help on each command.\n"),
+                         "Use “%s COMMAND --help” to get help on each command.\n"),
                        program_name);
   g_free (program_name);
   g_option_context_set_description (o, s);
@@ -468,7 +468,7 @@ call_helper_get_method_in_signature (GDBusConnection  *c,
   if (interface_info == NULL)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   _("Warning: According to introspection data, interface '%s' does not exist\n"),
+                   _("Warning: According to introspection data, interface “%s” does not exist\n"),
                    interface_name);
       goto out;
     }
@@ -477,7 +477,7 @@ call_helper_get_method_in_signature (GDBusConnection  *c,
   if (method_info == NULL)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   _("Warning: According to introspection data, method '%s' does not exist on interface 
'%s'\n"),
+                   _("Warning: According to introspection data, method “%s” does not exist on interface 
“%s”\n"),
                    method_name,
                    interface_name);
       goto out;
@@ -947,7 +947,7 @@ handle_call (gint        *argc,
   s = strrchr (opt_call_method, '.');
   if (!request_completion && s == NULL)
     {
-      g_printerr (_("Error: Method name '%s' is invalid\n"), opt_call_method);
+      g_printerr (_("Error: Method name “%s” is invalid\n"), opt_call_method);
       goto out;
     }
   method_name = g_strdup (s + 1);
@@ -1025,7 +1025,7 @@ handle_call (gint        *argc,
               if (type != NULL)
                 {
                   s = g_variant_type_dup_string (type);
-                  g_printerr (_("Error parsing parameter %d of type '%s': %s\n"),
+                  g_printerr (_("Error parsing parameter %d of type “%s”: %s\n"),
                               parm + 1,
                               s,
                               context);
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index d058666..23f18c9 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -150,7 +150,7 @@ is_valid_unix (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Unsupported key '%s' in address entry '%s'"),
+                       _("Unsupported key “%s” in address entry “%s”"),
                        key,
                        address_entry);
           goto out;
@@ -177,7 +177,7 @@ is_valid_unix (const gchar  *address_entry,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)"),
+                   _("Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"),
                    address_entry);
       goto out;
     }
@@ -190,7 +190,7 @@ is_valid_unix (const gchar  *address_entry,
   g_set_error (error,
                G_IO_ERROR,
                G_IO_ERROR_INVALID_ARGUMENT,
-               _("Meaningless key/value pair combination in address entry '%s'"),
+               _("Meaningless key/value pair combination in address entry “%s”"),
                address_entry);
 
  out:
@@ -238,7 +238,7 @@ is_valid_nonce_tcp (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Unsupported key '%s' in address entry '%s'"),
+                       _("Unsupported key “%s” in address entry “%s”"),
                        key,
                        address_entry);
           goto out;
@@ -253,7 +253,7 @@ is_valid_nonce_tcp (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error in address '%s' - the port attribute is malformed"),
+                       _("Error in address “%s” — the port attribute is malformed"),
                        address_entry);
           goto out;
         }
@@ -264,7 +264,7 @@ is_valid_nonce_tcp (const gchar  *address_entry,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Error in address '%s' - the family attribute is malformed"),
+                   _("Error in address “%s” — the family attribute is malformed"),
                    address_entry);
       goto out;
     }
@@ -319,7 +319,7 @@ is_valid_tcp (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Unsupported key '%s' in address entry '%s'"),
+                       _("Unsupported key “%s” in address entry “%s”"),
                        key,
                        address_entry);
           goto out;
@@ -334,7 +334,7 @@ is_valid_tcp (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error in address '%s' - the port attribute is malformed"),
+                       _("Error in address “%s” — the port attribute is malformed"),
                        address_entry);
           goto out;
         }
@@ -345,7 +345,7 @@ is_valid_tcp (const gchar  *address_entry,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Error in address '%s' - the family attribute is malformed"),
+                   _("Error in address “%s” — the family attribute is malformed"),
                    address_entry);
       goto out;
     }
@@ -454,7 +454,7 @@ _g_dbus_address_parse_entry (const gchar  *address_entry,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Address element '%s' does not contain a colon (:)"),
+                   _("Address element “%s” does not contain a colon (:)"),
                    address_entry);
       goto out;
     }
@@ -475,7 +475,7 @@ _g_dbus_address_parse_entry (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Key/Value pair %d, '%s', in address element '%s' does not contain an equal sign"),
+                       _("Key/Value pair %d, “%s”, in address element “%s” does not contain an equal sign"),
                        n,
                        kv_pair,
                        address_entry);
@@ -489,7 +489,7 @@ _g_dbus_address_parse_entry (const gchar  *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error unescaping key or value in Key/Value pair %d, '%s', in address element 
'%s'"),
+                       _("Error unescaping key or value in Key/Value pair %d, “%s”, in address element 
“%s”"),
                        n,
                        kv_pair,
                        address_entry);
@@ -567,8 +567,8 @@ g_dbus_address_connect (const gchar   *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error in address '%s' - the unix transport requires exactly one of the "
-                         "keys 'path' or 'abstract' to be set"),
+                       _("Error in address “%s” — the unix transport requires exactly one of the "
+                         "keys “path” or “abstract” to be set"),
                        address_entry);
         }
       else if (path != NULL)
@@ -603,7 +603,7 @@ g_dbus_address_connect (const gchar   *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error in address '%s' - the host attribute is missing or malformed"),
+                       _("Error in address “%s” — the host attribute is missing or malformed"),
                        address_entry);
           goto out;
         }
@@ -617,7 +617,7 @@ g_dbus_address_connect (const gchar   *address_entry,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error in address '%s' - the port attribute is missing or malformed"),
+                       _("Error in address “%s” — the port attribute is missing or malformed"),
                        address_entry);
           goto out;
         }
@@ -631,7 +631,7 @@ g_dbus_address_connect (const gchar   *address_entry,
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_INVALID_ARGUMENT,
-                           _("Error in address '%s' - the noncefile attribute is missing or malformed"),
+                           _("Error in address “%s” — the noncefile attribute is missing or malformed"),
                            address_entry);
               goto out;
             }
@@ -660,7 +660,7 @@ g_dbus_address_connect (const gchar   *address_entry,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Unknown or unsupported transport '%s' for address '%s'"),
+                   _("Unknown or unsupported transport “%s” for address “%s”"),
                    transport_name,
                    address_entry);
     }
@@ -696,7 +696,7 @@ g_dbus_address_connect (const gchar   *address_entry,
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_INVALID_ARGUMENT,
-                           _("Error opening nonce file '%s': %s"),
+                           _("Error opening nonce file “%s”: %s"),
                            nonce_file,
                            g_strerror (errno));
               g_object_unref (ret);
@@ -714,7 +714,7 @@ g_dbus_address_connect (const gchar   *address_entry,
                   g_set_error (error,
                                G_IO_ERROR,
                                G_IO_ERROR_INVALID_ARGUMENT,
-                               _("Error reading from nonce file '%s': %s"),
+                               _("Error reading from nonce file “%s”: %s"),
                                nonce_file,
                                g_strerror (errno));
                 }
@@ -723,7 +723,7 @@ g_dbus_address_connect (const gchar   *address_entry,
                   g_set_error (error,
                                G_IO_ERROR,
                                G_IO_ERROR_INVALID_ARGUMENT,
-                               _("Error reading from nonce file '%s', expected 16 bytes, got %d"),
+                               _("Error reading from nonce file “%s”, expected 16 bytes, got %d"),
                                nonce_file,
                                (gint) num_bytes_read);
                 }
@@ -741,7 +741,7 @@ g_dbus_address_connect (const gchar   *address_entry,
                                           cancellable,
                                           error))
             {
-              g_prefix_error (error, _("Error writing contents of nonce file '%s' to stream:"), nonce_file);
+              g_prefix_error (error, _("Error writing contents of nonce file “%s” to stream:"), nonce_file);
               g_object_unref (ret);
               ret = NULL;
               goto out;
@@ -1117,7 +1117,7 @@ get_session_address_dbus_launch (GError **error)
 
   if (!g_spawn_check_exit_status (exit_status, error))
     {
-      g_prefix_error (error, _("Error spawning command line '%s': "), command_line);
+      g_prefix_error (error, _("Error spawning command line “%s”: "), command_line);
       goto out;
     }
 
@@ -1633,7 +1633,7 @@ g_dbus_address_get_for_bus_sync (GBusType       bus_type,
                            G_IO_ERROR,
                            G_IO_ERROR_FAILED,
                            _("Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable"
-                             " - unknown value '%s'"),
+                             " — unknown value “%s”"),
                            starter_bus);
             }
           else
diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
index 0b9db7f..0aa5c25 100644
--- a/gio/gdbusauthmechanismsha1.c
+++ b/gio/gdbusauthmechanismsha1.c
@@ -258,7 +258,7 @@ ensure_keyring_directory (GError **error)
               g_set_error (error,
                            G_IO_ERROR,
                            g_io_error_from_errno (errno),
-                           _("Error when getting information for directory '%s': %s"),
+                           _("Error when getting information for directory “%s”: %s"),
                            path,
                            strerror (errno));
               g_free (path);
@@ -270,7 +270,7 @@ ensure_keyring_directory (GError **error)
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_FAILED,
-                           _("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"),
+                           _("Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"),
                            path,
                            statbuf.st_mode & 0777);
               g_free (path);
@@ -291,7 +291,7 @@ ensure_keyring_directory (GError **error)
       g_set_error (error,
                    G_IO_ERROR,
                    g_io_error_from_errno (errno),
-                   _("Error creating directory '%s': %s"),
+                   _("Error creating directory “%s”: %s"),
                    path,
                    strerror (errno));
       g_free (path);
@@ -374,7 +374,7 @@ keyring_lookup_entry (const gchar  *cookie_context,
                             error))
     {
       g_prefix_error (error,
-                      _("Error opening keyring '%s' for reading: "),
+                      _("Error opening keyring “%s” for reading: "),
                       path);
       goto out;
     }
@@ -398,7 +398,7 @@ keyring_lookup_entry (const gchar  *cookie_context,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_FAILED,
-                       _("Line %d of the keyring at '%s' with content '%s' is malformed"),
+                       _("Line %d of the keyring at “%s” with content “%s” is malformed"),
                        n + 1,
                        path,
                        line);
@@ -412,7 +412,7 @@ keyring_lookup_entry (const gchar  *cookie_context,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_FAILED,
-                       _("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
+                       _("First token of line %d of the keyring at “%s” with content “%s” is malformed"),
                        n + 1,
                        path,
                        line);
@@ -427,7 +427,7 @@ keyring_lookup_entry (const gchar  *cookie_context,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_FAILED,
-                       _("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
+                       _("Second token of line %d of the keyring at “%s” with content “%s” is malformed"),
                        n + 1,
                        path,
                        line);
@@ -451,7 +451,7 @@ keyring_lookup_entry (const gchar  *cookie_context,
   g_set_error (error,
                G_IO_ERROR,
                G_IO_ERROR_FAILED,
-               _("Didn't find cookie with id %d in the keyring at '%s'"),
+               _("Didn’t find cookie with id %d in the keyring at “%s”"),
                cookie_id,
                path);
 
@@ -529,7 +529,7 @@ keyring_acquire_lock (const gchar  *path,
               g_set_error (error,
                            G_IO_ERROR,
                            g_io_error_from_errno (errno),
-                           _("Error deleting stale lock file '%s': %s"),
+                           _("Error deleting stale lock file “%s”: %s"),
                            lock,
                            strerror (errno));
               goto out;
@@ -561,7 +561,7 @@ keyring_acquire_lock (const gchar  *path,
       g_set_error (error,
                    G_IO_ERROR,
                    g_io_error_from_errno (errno),
-                   _("Error creating lock file '%s': %s"),
+                   _("Error creating lock file “%s”: %s"),
                    lock,
                    strerror (errno));
       goto out;
@@ -591,7 +591,7 @@ keyring_release_lock (const gchar  *path,
       g_set_error (error,
                    G_IO_ERROR,
                    g_io_error_from_errno (errno),
-                   _("Error closing (unlinked) lock file '%s': %s"),
+                   _("Error closing (unlinked) lock file “%s”: %s"),
                    lock,
                    strerror (errno));
       goto out;
@@ -601,7 +601,7 @@ keyring_release_lock (const gchar  *path,
       g_set_error (error,
                    G_IO_ERROR,
                    g_io_error_from_errno (errno),
-                   _("Error unlinking lock file '%s': %s"),
+                   _("Error unlinking lock file “%s”: %s"),
                    lock,
                    strerror (errno));
       goto out;
@@ -678,7 +678,7 @@ keyring_generate_entry (const gchar  *cookie_context,
         {
           g_propagate_prefixed_error (error,
                                       local_error,
-                                      _("Error opening keyring '%s' for writing: "),
+                                      _("Error opening keyring “%s” for writing: "),
                                       path);
           goto out;
         }
@@ -711,7 +711,7 @@ keyring_generate_entry (const gchar  *cookie_context,
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_FAILED,
-                           _("Line %d of the keyring at '%s' with content '%s' is malformed"),
+                           _("Line %d of the keyring at “%s” with content “%s” is malformed"),
                            n + 1,
                            path,
                            line);
@@ -725,7 +725,7 @@ keyring_generate_entry (const gchar  *cookie_context,
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_FAILED,
-                           _("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
+                           _("First token of line %d of the keyring at “%s” with content “%s” is malformed"),
                            n + 1,
                            path,
                            line);
@@ -739,7 +739,7 @@ keyring_generate_entry (const gchar  *cookie_context,
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_FAILED,
-                           _("Second token of line %d of the keyring at '%s' with content '%s' is 
malformed"),
+                           _("Second token of line %d of the keyring at “%s” with content “%s” is 
malformed"),
                            n + 1,
                            path,
                            line);
@@ -875,7 +875,7 @@ keyring_generate_entry (const gchar  *cookie_context,
               else
                 {
                   g_prefix_error (error,
-                                  _("(Additionally, releasing the lock for '%s' also failed: %s) "),
+                                  _("(Additionally, releasing the lock for “%s” also failed: %s) "),
                                   path,
                                   local_error->message);
                 }
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 8977c67..96412cb 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/gdbusmessage.c b/gio/gdbusmessage.c
index d9d8f37..86bd5bf 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -1366,7 +1366,7 @@ read_string (GMemoryBuffer  *mbuf,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Expected NUL byte after the string '%s' but found byte %d"),
+                   _("Expected NUL byte after the string “%s” but found byte %d"),
                    str, mbuf->data[mbuf->pos + len]);
       g_free (str);
       mbuf->pos += len + 1;
@@ -1386,7 +1386,7 @@ read_string (GMemoryBuffer  *mbuf,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
                    _("Expected valid UTF-8 string but found invalid bytes at byte offset %d (length of 
string is %d). "
-                     "The valid UTF-8 string up until that point was '%s'"),
+                     "The valid UTF-8 string up until that point was “%s”"),
                    offset,
                    (gint) len,
                    valid_str);
@@ -1584,7 +1584,7 @@ parse_value_from_blob (GMemoryBuffer       *buf,
               g_set_error (&local_error,
                            G_IO_ERROR,
                            G_IO_ERROR_INVALID_ARGUMENT,
-                           _("Parsed value '%s' is not a valid D-Bus object path"),
+                           _("Parsed value “%s” is not a valid D-Bus object path"),
                            v);
               goto fail;
             }
@@ -1606,7 +1606,7 @@ parse_value_from_blob (GMemoryBuffer       *buf,
               g_set_error (&local_error,
                            G_IO_ERROR,
                            G_IO_ERROR_INVALID_ARGUMENT,
-                           _("Parsed value '%s' is not a valid D-Bus signature"),
+                           _("Parsed value “%s” is not a valid D-Bus signature"),
                        v);
               goto fail;
             }
@@ -1673,7 +1673,7 @@ parse_value_from_blob (GMemoryBuffer       *buf,
                   g_set_error (&local_error,
                                G_IO_ERROR,
                                G_IO_ERROR_INVALID_ARGUMENT,
-                               _("Encountered array of type 'a%c', expected to have a length a multiple "
+                               _("Encountered array of type “a%c”, expected to have a length a multiple "
                                  "of %u bytes, but found to be %u bytes in length"),
                                g_variant_type_peek_string (element_type)[0], fixed_size, array_len);
                   goto fail;
@@ -1840,7 +1840,7 @@ parse_value_from_blob (GMemoryBuffer       *buf,
                   g_set_error (&local_error,
                                G_IO_ERROR,
                                G_IO_ERROR_INVALID_ARGUMENT,
-                               _("Parsed value '%s' for variant is not a valid D-Bus signature"),
+                               _("Parsed value “%s” for variant is not a valid D-Bus signature"),
                                sig);
                   goto fail;
                 }
@@ -1864,7 +1864,7 @@ parse_value_from_blob (GMemoryBuffer       *buf,
           g_set_error (&local_error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error deserializing GVariant with type string '%s' from the D-Bus wire format"),
+                       _("Error deserializing GVariant with type string “%s” from the D-Bus wire format"),
                        s);
           g_free (s);
           goto fail;
@@ -2048,7 +2048,7 @@ g_dbus_message_new_from_blob (guchar                *blob,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value 0x%02x"),
+                   _("Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value 0x%02x"),
                    endianness);
       goto out;
     }
@@ -2117,7 +2117,7 @@ g_dbus_message_new_from_blob (guchar                *blob,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Signature header with signature '%s' found but message body is empty"),
+                       _("Signature header with signature “%s” found but message body is empty"),
                        signature_str);
           goto out;
         }
@@ -2131,7 +2131,7 @@ g_dbus_message_new_from_blob (guchar                *blob,
               g_set_error (error,
                            G_IO_ERROR,
                            G_IO_ERROR_INVALID_ARGUMENT,
-                           _("Parsed value '%s' is not a valid D-Bus signature (for body)"),
+                           _("Parsed value “%s” is not a valid D-Bus signature (for body)"),
                            signature_str);
               goto out;
             }
@@ -2512,7 +2512,7 @@ append_value_to_blob (GVariant            *value,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Error serializing GVariant with type string '%s' to the D-Bus wire format"),
+                       _("Error serializing GVariant with type string “%s” to the D-Bus wire format"),
                        g_variant_get_type_string (value));
           goto fail;
         }
@@ -2701,7 +2701,7 @@ g_dbus_message_to_blob (GDBusMessage          *message,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Message body has signature '%s' but there is no signature header"),
+                       _("Message body has signature “%s” but there is no signature header"),
                        signature_str);
           g_free (tupled_signature_str);
           goto out;
@@ -2711,7 +2711,7 @@ g_dbus_message_to_blob (GDBusMessage          *message,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Message body has type signature '%s' but signature in the header field is '%s'"),
+                       _("Message body has type signature “%s” but signature in the header field is “%s”"),
                        tupled_signature_str, g_variant_get_type_string (message->body));
           g_free (tupled_signature_str);
           goto out;
@@ -2727,7 +2727,7 @@ g_dbus_message_to_blob (GDBusMessage          *message,
           g_set_error (error,
                        G_IO_ERROR,
                        G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Message body is empty but signature in the header field is '(%s)'"),
+                       _("Message body is empty but signature in the header field is “(%s)”"),
                        signature_str);
           goto out;
         }
@@ -3280,7 +3280,7 @@ g_dbus_message_to_gerror (GDBusMessage   *message,
               g_dbus_error_set_dbus_error (error,
                                            error_name,
                                            "",
-                                           _("Error return with body of type '%s'"),
+                                           _("Error return with body of type “%s”"),
                                            g_variant_get_type_string (body));
             }
           else
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index dbafc18..d23711f 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -870,7 +870,7 @@ try_tcp (GDBusServer  *server,
               g_set_error (error,
                            G_IO_ERROR,
                            g_io_error_from_errno (errno),
-                           _("Error writing nonce file at '%s': %s"),
+                           _("Error writing nonce file at “%s”: %s"),
                            server->nonce_file,
                            strerror (errno));
               goto out;
@@ -1041,7 +1041,7 @@ initable_init (GInitable     *initable,
       g_set_error (&last_error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("The string '%s' is not a valid D-Bus GUID"),
+                   _("The string “%s” is not a valid D-Bus GUID"),
                    server->guid);
       goto out;
     }
@@ -1081,7 +1081,7 @@ initable_init (GInitable     *initable,
             g_set_error (&this_error,
                          G_IO_ERROR,
                          G_IO_ERROR_INVALID_ARGUMENT,
-                         _("Cannot listen on unsupported transport '%s'"),
+                         _("Cannot listen on unsupported transport “%s”"),
                          transport_name);
 
           g_free (transport_name);
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index f45328e..fe9d71a 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2401,7 +2401,7 @@ expand_application_parameters (GDesktopAppInfo   *info,
   if (exec_line == NULL)
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                           _("Desktop file didn't specify Exec field"));
+                           _("Desktop file didn’t specify Exec field"));
       return FALSE;
     }
 
@@ -3094,11 +3094,11 @@ ensure_dir (DirType   type,
   display_name = g_filename_display_name (path);
   if (type == APP_DIR)
     g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                 _("Can't create user application configuration folder %s: %s"),
+                 _("Can’t create user application configuration folder %s: %s"),
                  display_name, g_strerror (errsv));
   else
     g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                 _("Can't create user MIME configuration folder %s: %s"),
+                 _("Can’t create user MIME configuration folder %s: %s"),
                  display_name, g_strerror (errsv));
 
   g_free (display_name);
@@ -3596,7 +3596,7 @@ g_desktop_app_info_ensure_saved (GDesktopAppInfo  *info,
 
       display_name = g_filename_display_name (filename);
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   _("Can't create user desktop file %s"), display_name);
+                   _("Can’t create user desktop file %s"), display_name);
       g_free (display_name);
       g_free (filename);
       g_free (data);
diff --git a/gio/gdrive.c b/gio/gdrive.c
index ab19ab8..f69bc61 100644
--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@ -414,7 +414,7 @@ g_drive_eject (GDrive              *drive,
       g_task_report_new_error (drive, callback, user_data,
                                g_drive_eject_with_operation,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("drive doesn't implement eject"));
+                               _("drive doesn’t implement eject"));
       return;
     }
   
@@ -492,7 +492,7 @@ g_drive_eject_with_operation (GDrive              *drive,
                                /* Translators: This is an error
                                 * message for drive objects that
                                 * don't implement any of eject or eject_with_operation. */
-                               _("drive doesn't implement eject or eject_with_operation"));
+                               _("drive doesn’t implement eject or eject_with_operation"));
       return;
     }
 
@@ -568,7 +568,7 @@ g_drive_poll_for_media (GDrive              *drive,
       g_task_report_new_error (drive, callback, user_data,
                                g_drive_poll_for_media,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("drive doesn't implement polling for media"));
+                               _("drive doesn’t implement polling for media"));
       return;
     }
   
@@ -773,7 +773,7 @@ g_drive_start (GDrive              *drive,
       g_task_report_new_error (drive, callback, user_data,
                                g_drive_start,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("drive doesn't implement start"));
+                               _("drive doesn’t implement start"));
       return;
     }
 
@@ -875,7 +875,7 @@ g_drive_stop (GDrive               *drive,
       g_task_report_new_error (drive, callback, user_data,
                                g_drive_start,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("drive doesn't implement stop"));
+                               _("drive doesn’t implement stop"));
       return;
     }
 
diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c
index 08fa84f..cfa2826 100644
--- a/gio/gdtlsconnection.c
+++ b/gio/gdtlsconnection.c
@@ -183,7 +183,7 @@ g_dtls_connection_default_init (GDtlsConnectionInterface *iface)
   g_object_interface_install_property (iface,
                                        g_param_spec_object ("certificate",
                                                             P_("Certificate"),
-                                                            P_("The connection's certificate"),
+                                                            P_("The connection’s certificate"),
                                                             G_TYPE_TLS_CERTIFICATE,
                                                             G_PARAM_READWRITE |
                                                             G_PARAM_STATIC_STRINGS));
@@ -203,7 +203,7 @@ g_dtls_connection_default_init (GDtlsConnectionInterface *iface)
   g_object_interface_install_property (iface,
                                        g_param_spec_object ("peer-certificate",
                                                             P_("Peer Certificate"),
-                                                            P_("The connection's peer's certificate"),
+                                                            P_("The connection’s peer’s certificate"),
                                                             G_TYPE_TLS_CERTIFICATE,
                                                             G_PARAM_READABLE |
                                                             G_PARAM_STATIC_STRINGS));
@@ -222,7 +222,7 @@ g_dtls_connection_default_init (GDtlsConnectionInterface *iface)
   g_object_interface_install_property (iface,
                                        g_param_spec_flags ("peer-certificate-errors",
                                                            P_("Peer Certificate Errors"),
-                                                           P_("Errors found with the peer's certificate"),
+                                                           P_("Errors found with the peer’s certificate"),
                                                            G_TYPE_TLS_CERTIFICATE_FLAGS,
                                                            0,
                                                            G_PARAM_READABLE |
diff --git a/gio/gemblem.c b/gio/gemblem.c
index ed35eb2..96304c6 100644
--- a/gio/gemblem.c
+++ b/gio/gemblem.c
@@ -138,7 +138,7 @@ g_emblem_class_init (GEmblemClass *klass)
   g_object_class_install_property (gobject_class,
                                    PROP_ORIGIN,
                                    g_param_spec_enum ("origin",
-                                                      P_("GEmblem's origin"),
+                                                      P_("GEmblem’s origin"),
                                                       P_("Tells which origin the emblem is derived from"),
                                                       G_TYPE_EMBLEM_ORIGIN,
                                                       G_EMBLEM_ORIGIN_UNKNOWN,
@@ -320,7 +320,7 @@ g_emblem_from_tokens (gchar  **tokens,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Can't handle version %d of GEmblem encoding"),
+                   _("Can’t handle version %d of GEmblem encoding"),
                    version);
       return NULL;
     }
diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c
index f90af89..95bc72e 100644
--- a/gio/gemblemedicon.c
+++ b/gio/gemblemedicon.c
@@ -359,7 +359,7 @@ g_emblemed_icon_from_tokens (gchar  **tokens,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Can't handle version %d of GEmblemedIcon encoding"),
+                   _("Can’t handle version %d of GEmblemedIcon encoding"),
                    version);
       goto fail;
     }
diff --git a/gio/gfile.c b/gio/gfile.c
index 851213e..0e9b608 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -2512,7 +2512,7 @@ copy_symlink (GFile           *destination,
               if (file_type == G_FILE_TYPE_DIRECTORY)
                 {
                   g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
-                                       _("Can't copy over directory"));
+                                       _("Can’t copy over directory"));
                   return FALSE;
                 }
             }
@@ -2572,7 +2572,7 @@ open_source_for_copy (GFile           *source,
               if (file_type == G_FILE_TYPE_DIRECTORY)
                 {
                   g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_MERGE,
-                                       _("Can't copy directory over directory"));
+                                       _("Can’t copy directory over directory"));
                   return NULL;
                 }
               /* continue to would_recurse error */
@@ -2599,7 +2599,7 @@ open_source_for_copy (GFile           *source,
         }
 
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_RECURSE,
-                           _("Can't recursively copy directory"));
+                           _("Can’t recursively copy directory"));
       return NULL;
     }
 
@@ -3025,7 +3025,7 @@ btrfs_reflink_with_progress (GInputStream           *in,
        /* Most probably something odd happened; retry with fallback */
        g_set_error_literal (error, G_IO_ERROR,
                             G_IO_ERROR_NOT_SUPPORTED,
-                            _("Copy (reflink/clone) is not supported or didn't work"));
+                            _("Copy (reflink/clone) is not supported or didn’t work"));
       /* We retry with fallback for all error cases because Btrfs is currently
        * unstable, and so we can't trust it to do clone properly.
        * In addition, any hard errors here would cause the same failure in the
@@ -3088,7 +3088,7 @@ file_copy_fallback (GFile                  *source,
     {
       /* FIXME: could try to recreate device nodes and others? */
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                           _("Can't copy special file"));
+                           _("Can’t copy special file"));
       goto out;
     }
 
@@ -4155,7 +4155,7 @@ g_file_set_display_name (GFile         *file,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("File names cannot contain '%c'"), G_DIR_SEPARATOR);
+                   _("File names cannot contain “%c”"), G_DIR_SEPARATOR);
       return NULL;
     }
 
@@ -6601,7 +6601,7 @@ g_file_mount_enclosing_volume (GFile               *location,
       g_task_report_new_error (location, callback, user_data,
                                g_file_mount_enclosing_volume,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("volume doesn't implement mount"));
+                               _("volume doesn’t implement mount"));
       return;
     }
 
diff --git a/gio/gfileicon.c b/gio/gfileicon.c
index 793a2ab..fb76d8a 100644
--- a/gio/gfileicon.c
+++ b/gio/gfileicon.c
@@ -233,7 +233,7 @@ g_file_icon_from_tokens (gchar  **tokens,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Can't handle version %d of GFileIcon encoding"),
+                   _("Can’t handle version %d of GFileIcon encoding"),
                    version);
       goto out;
     }
diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c
index 273bd22..bdfb779 100644
--- a/gio/gfileinputstream.c
+++ b/gio/gfileinputstream.c
@@ -146,7 +146,7 @@ g_file_input_stream_query_info (GFileInputStream  *stream,
     info = class->query_info (stream, attributes, cancellable, error);
   else
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                         _("Stream doesn't support query_info"));
+                         _("Stream doesn’t support query_info"));
 
   if (cancellable)
     g_cancellable_pop_current (cancellable);
@@ -391,7 +391,7 @@ query_info_async_thread (GTask        *task,
     info = class->query_info (stream, attributes, cancellable, &error);
   else
     g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                         _("Stream doesn't support query_info"));
+                         _("Stream doesn’t support query_info"));
 
   if (info == NULL)
     g_task_return_error (task, error);
diff --git a/gio/gfileiostream.c b/gio/gfileiostream.c
index 87c424a..8a0ec15 100644
--- a/gio/gfileiostream.c
+++ b/gio/gfileiostream.c
@@ -164,7 +164,7 @@ g_file_io_stream_query_info (GFileIOStream      *stream,
     info = class->query_info (stream, attributes, cancellable, error);
   else
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                         _("Stream doesn't support query_info"));
+                         _("Stream doesn’t support query_info"));
 
   if (cancellable)
     g_cancellable_pop_current (cancellable);
diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c
index 61987ca..e6e298a 100644
--- a/gio/gfileoutputstream.c
+++ b/gio/gfileoutputstream.c
@@ -161,7 +161,7 @@ g_file_output_stream_query_info (GFileOutputStream      *stream,
     info = class->query_info (stream, attributes, cancellable, error);
   else
     g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                         _("Stream doesn't support query_info"));
+                         _("Stream doesn’t support query_info"));
   
   if (cancellable)
     g_cancellable_pop_current (cancellable);
@@ -494,7 +494,7 @@ query_info_async_thread (GTask        *task,
     info = class->query_info (stream, attributes, cancellable, &error);
   else
     g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                         _("Stream doesn't support query_info"));
+                         _("Stream doesn’t support query_info"));
 
   if (info == NULL)
     g_task_return_error (task, error);
diff --git a/gio/gicon.c b/gio/gicon.c
index 6c9a3ec..a252c40 100644
--- a/gio/gicon.c
+++ b/gio/gicon.c
@@ -458,7 +458,7 @@ g_icon_new_for_string (const gchar   *str,
     g_set_error_literal (error,
                          G_IO_ERROR,
                          G_IO_ERROR_INVALID_ARGUMENT,
-                         _("Can't handle the supplied version of the icon encoding"));
+                         _("Can’t handle the supplied version of the icon encoding"));
 
   return icon;
 }
diff --git a/gio/ginetaddressmask.c b/gio/ginetaddressmask.c
index f717c77..2279abf 100644
--- a/gio/ginetaddressmask.c
+++ b/gio/ginetaddressmask.c
@@ -297,7 +297,7 @@ g_inet_address_mask_new_from_string (const gchar  *mask_string,
        {
        parse_error:
          g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                      _("Could not parse '%s' as IP address mask"),
+                      _("Could not parse “%s” as IP address mask"),
                       mask_string);
          return NULL;
        }
diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index 772bd1f..9406bbb 100644
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.c
@@ -185,7 +185,7 @@ g_input_stream_read  (GInputStream  *stream,
   if (class->read_fn == NULL) 
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                           _("Input stream doesn't implement read"));
+                           _("Input stream doesn’t implement read"));
       return -1;
     }
 
diff --git a/gio/gio-tool-copy.c b/gio/gio-tool-copy.c
index 4f3c391..c64fd4e 100644
--- a/gio/gio-tool-copy.c
+++ b/gio/gio-tool-copy.c
@@ -184,7 +184,7 @@ handle_copy (int argc, char *argv[], gboolean do_help)
               error = NULL;
 
               uri = g_file_get_uri (target);
-              g_print (_("%s: overwrite '%s'? "), argv[0], uri);
+              g_print (_("%s: overwrite “%s”? "), argv[0], uri);
               g_free (uri);
 
               if (fgets (line, sizeof (line), stdin) &&
diff --git a/gio/gio-tool-info.c b/gio/gio-tool-info.c
index 055fd58..8b86293 100644
--- a/gio/gio-tool-info.c
+++ b/gio/gio-tool-info.c
@@ -34,7 +34,7 @@ static const GOptionEntry entries[] = {
   { "query-writable", 'w', 0, G_OPTION_ARG_NONE, &writable, N_("List writable attributes"), NULL },
   { "filesystem", 'f', 0, G_OPTION_ARG_NONE, &filesystem, N_("Get file system info"), NULL },
   { "attributes", 'a', 0, G_OPTION_ARG_STRING, &attributes, N_("The attributes to get"), N_("ATTRIBUTES") },
-  { "nofollow-symlinks", 'n', 0, G_OPTION_ARG_NONE, &nofollow_symlinks, N_("Don't follow symbolic links"), 
NULL },
+  { "nofollow-symlinks", 'n', 0, G_OPTION_ARG_NONE, &nofollow_symlinks, N_("Don’t follow symbolic links"), 
NULL },
   { NULL }
 };
 
@@ -286,7 +286,7 @@ handle_info (int argc, char *argv[], gboolean do_help)
         "locations instead of local files: for example, you can use something\n"
         "like smb://server/resource/file.txt as location. File attributes can\n"
         "be specified with their GIO name, e.g. standard::icon, or just by\n"
-        "namespace, e.g. unix, or by '*', which matches all attributes"));
+        "namespace, e.g. unix, or by “*”, which matches all attributes"));
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 
   if (do_help)
diff --git a/gio/gio-tool-list.c b/gio/gio-tool-list.c
index ec38583..528024f 100644
--- a/gio/gio-tool-list.c
+++ b/gio/gio-tool-list.c
@@ -35,7 +35,7 @@ static const GOptionEntry entries[] = {
   { "attributes", 'a', 0, G_OPTION_ARG_STRING, &attributes, N_("The attributes to get"), N_("ATTRIBUTES") },
   { "hidden", 'h', 0, G_OPTION_ARG_NONE, &show_hidden, N_("Show hidden files"), NULL },
   { "long", 'l', 0, G_OPTION_ARG_NONE, &show_long, N_("Use a long listing format"), NULL },
-  { "nofollow-symlinks", 'n', 0, G_OPTION_ARG_NONE, &nofollow_symlinks, N_("Don't follow symbolic links"), 
NULL},
+  { "nofollow-symlinks", 'n', 0, G_OPTION_ARG_NONE, &nofollow_symlinks, N_("Don’t follow symbolic links"), 
NULL},
   { "print-uris", 'u', 0, G_OPTION_ARG_NONE, &print_uris, N_("Print full URIs"), NULL},
   { NULL }
 };
diff --git a/gio/gio-tool-mime.c b/gio/gio-tool-mime.c
index 467808d..92a96c0 100644
--- a/gio/gio-tool-mime.c
+++ b/gio/gio-tool-mime.c
@@ -110,13 +110,13 @@ handle_mime (int argc, char *argv[], gboolean do_help)
       info = g_app_info_get_default_for_type (mimetype, FALSE);
       if (!info)
         {
-          g_print (_("No default applications for '%s'\n"), mimetype);
+          g_print (_("No default applications for “%s”\n"), mimetype);
         }
       else
         {
           GList *list, *l;
 
-          g_print (_("Default application for '%s': %s\n"), mimetype, g_app_info_get_id (info));
+          g_print (_("Default application for “%s”: %s\n"), mimetype, g_app_info_get_id (info));
           g_object_unref (info);
 
           list = g_app_info_get_all_for_type (mimetype);
@@ -156,13 +156,13 @@ handle_mime (int argc, char *argv[], gboolean do_help)
       info = get_app_info_for_id (handler);
       if (info == NULL)
         {
-          g_printerr (_("Failed to load info for handler '%s'\n"), handler);
+          g_printerr (_("Failed to load info for handler “%s”\n"), handler);
           return 1;
         }
 
       if (g_app_info_set_as_default_for_type (info, mimetype, &error) == FALSE)
         {
-          g_printerr (_("Failed to set '%s' as the default handler for '%s': %s\n"),
+          g_printerr (_("Failed to set “%s” as the default handler for “%s”: %s\n"),
                       handler, mimetype, error->message);
           g_error_free (error);
           g_object_unref (info);
diff --git a/gio/gio-tool-monitor.c b/gio/gio-tool-monitor.c
index e137a5d..9e43d99 100644
--- a/gio/gio-tool-monitor.c
+++ b/gio/gio-tool-monitor.c
@@ -40,7 +40,7 @@ static const GOptionEntry entries[] = {
   { "direct", 'D', 0, G_OPTION_ARG_FILENAME_ARRAY, &watch_direct,
       N_("Monitor a file directly (notices changes made via hardlinks)"), N_("LOCATION") },
   { "silent", 's', 0, G_OPTION_ARG_FILENAME_ARRAY, &watch_silent,
-      N_("Monitors a file directly, but doesn't report changes"), N_("LOCATION") },
+      N_("Monitors a file directly, but doesn’t report changes"), N_("LOCATION") },
   { "no-moves", 'n', 0, G_OPTION_ARG_NONE, &no_moves,
       N_("Report moves and renames as simple deleted/created events"), NULL },
   { "mounts", 'm', 0, G_OPTION_ARG_NONE, &mounts,
diff --git a/gio/gio-tool-move.c b/gio/gio-tool-move.c
index 253e610..acbe8e9 100644
--- a/gio/gio-tool-move.c
+++ b/gio/gio-tool-move.c
@@ -39,7 +39,7 @@ static const GOptionEntry entries[] = {
   { "progress", 'p', 0, G_OPTION_ARG_NONE, &progress, N_("Show progress"), NULL },
   { "interactive", 'i', 0, G_OPTION_ARG_NONE, &interactive, N_("Prompt before overwrite"), NULL },
   { "backup", 'b', 0, G_OPTION_ARG_NONE, &backup, N_("Backup existing destination files"), NULL },
-  { "no-copy-fallback", 'C', 0, G_OPTION_ARG_NONE, &no_copy_fallback, N_("Don't use copy and delete 
fallback"), NULL },
+  { "no-copy-fallback", 'C', 0, G_OPTION_ARG_NONE, &no_copy_fallback, N_("Don’t use copy and delete 
fallback"), NULL },
   { NULL }
 };
 
@@ -178,7 +178,7 @@ handle_move (int argc, char *argv[], gboolean do_help)
               error = NULL;
 
               uri = g_file_get_uri (target);
-              g_print (_("%s: overwrite '%s'? "), argv[0], uri);
+              g_print (_("%s: overwrite “%s”? "), argv[0], uri);
               g_free (uri);
               if (fgets (line, sizeof (line), stdin) &&
                   (line[0] == 'y' || line[0] == 'Y'))
diff --git a/gio/gio-tool-set.c b/gio/gio-tool-set.c
index 3a0e2e4..2b63aca 100644
--- a/gio/gio-tool-set.c
+++ b/gio/gio-tool-set.c
@@ -31,7 +31,7 @@ static gboolean nofollow_symlinks = FALSE;
 
 static const GOptionEntry entries[] = {
   { "type", 't', 0, G_OPTION_ARG_STRING, &attr_type, N_("Type of the attribute"), N_("TYPE") },
-  { "nofollow-symlinks", 'n', 0, G_OPTION_ARG_NONE, &nofollow_symlinks, N_("Don't follow symbolic links"), 
NULL },
+  { "nofollow-symlinks", 'n', 0, G_OPTION_ARG_NONE, &nofollow_symlinks, N_("Don’t follow symbolic links"), 
NULL },
   { NULL }
 };
 
diff --git a/gio/gio-tool.c b/gio/gio-tool.c
index 1c08431..2937d8e 100644
--- a/gio/gio-tool.c
+++ b/gio/gio-tool.c
@@ -184,7 +184,7 @@ handle_version (int argc, char *argv[], gboolean do_help)
   if (do_help || argc > 1)
     {
       if (!do_help)
-        g_printerr ("gio: %s\n\n", _("'version' takes no arguments"));
+        g_printerr ("gio: %s\n\n", _("“version” takes no arguments"));
 
       g_printerr ("%s\n", _("Usage:"));
       g_printerr ("  gio version\n");
@@ -225,7 +225,7 @@ usage (void)
   g_printerr ("  trash    %s\n", _("Move files or directories to the trash"));
   g_printerr ("  tree     %s\n", _("Lists the contents of locations in a tree"));
   g_printerr ("\n");
-  g_printerr (_("Use %s to get detailed help.\n"), "'gio help COMMAND'");
+  g_printerr (_("Use %s to get detailed help.\n"), "“gio help COMMAND”");
   exit (1);
 }
 
diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c
index 05d7334..9e0b0c1 100644
--- a/gio/glib-compile-resources.c
+++ b/gio/glib-compile-resources.c
@@ -245,7 +245,7 @@ end_element (GMarkupParseContext  *context,
          if (real_file == NULL && state->collect_data)
            {
                g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                            _("Failed to locate '%s' in any source directory"), file);
+                            _("Failed to locate “%s” in any source directory"), file);
                return;
            }
        }
@@ -256,7 +256,7 @@ end_element (GMarkupParseContext  *context,
          if (!exists && state->collect_data)
            {
              g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                          _("Failed to locate '%s' in current directory"), file);
+                          _("Failed to locate “%s” in current directory"), file);
              return;
            }
        }
@@ -287,7 +287,7 @@ end_element (GMarkupParseContext  *context,
               else
                 {
                   g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
-                               _("Unknown processing option \"%s\""), options[i]);
+                               _("Unknown processing option “%s”"), options[i]);
                   g_strfreev (options);
                   goto cleanup;
                 }
@@ -626,8 +626,8 @@ main (int argc, char **argv)
     { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate sourcecode used to link in 
the resource file into your code"), NULL },
     { "generate-dependencies", 0, 0, G_OPTION_ARG_NONE, &generate_dependencies, N_("Generate dependency 
list"), NULL },
     { "dependency-file", 0, 0, G_OPTION_ARG_FILENAME, &dependency_file, N_("name of the dependency file to 
generate"), N_("FILE") },
-    { "manual-register", 0, 0, G_OPTION_ARG_NONE, &manual_register, N_("Don't automatically create and 
register resource"), NULL },
-    { "internal", 0, 0, G_OPTION_ARG_NONE, &internal, N_("Don't export functions; declare them 
G_GNUC_INTERNAL"), NULL },
+    { "manual-register", 0, 0, G_OPTION_ARG_NONE, &manual_register, N_("Don’t automatically create and 
register resource"), NULL },
+    { "internal", 0, 0, G_OPTION_ARG_NONE, &internal, N_("Don’t export functions; declare them 
G_GNUC_INTERNAL"), NULL },
     { "c-name", 0, 0, G_OPTION_ARG_STRING, &c_name, N_("C identifier name used for the generated source 
code"), NULL },
     { NULL }
   };
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 833ae6b..8d1fdfb 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 <key>"));
       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,
-                           _("<override> given but schema isn't "
+                           _("<override> 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,
                        _("<schema id='%s'> 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,
                        _("<schema id='%s'> 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,
                            _("<schema id='%s' list-of='%s'> extends <schema "
-                             "id='%s' list-of='%s'> 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/gio/glocalfile.c b/gio/glocalfile.c
index a4c9fa5..8f64777 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1196,7 +1196,7 @@ g_local_file_set_display_name (GFile         *file,
   if (parent == NULL)
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                           _("Can't rename root directory"));
+                           _("Can’t rename root directory"));
       return NULL;
     }
   
@@ -1221,7 +1221,7 @@ g_local_file_set_display_name (GFile         *file,
   else
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
-                           _("Can't rename file, filename already exists"));
+                           _("Can’t rename file, filename already exists"));
       return NULL;
     }
 
@@ -2367,12 +2367,12 @@ g_local_file_move (GFile                  *source,
                g_set_error_literal (error,
                                      G_IO_ERROR,
                                      G_IO_ERROR_WOULD_MERGE,
-                                     _("Can't move directory over directory"));
+                                     _("Can’t move directory over directory"));
               else
                g_set_error_literal (error,
                                      G_IO_ERROR,
                                      G_IO_ERROR_IS_DIRECTORY,
-                                     _("Can't copy over directory"));
+                                     _("Can’t copy over directory"));
              return FALSE;
            }
        }
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 620320f..595d736 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -772,7 +772,7 @@ set_xattr (char                       *filename,
     {
       g_set_error (error, G_IO_ERROR,
                   g_io_error_from_errno (errsv),
-                  _("Error setting extended attribute '%s': %s"),
+                  _("Error setting extended attribute “%s”: %s"),
                   escaped_attribute, g_strerror (errsv));
       return FALSE;
     }
@@ -1763,7 +1763,7 @@ _g_local_file_info_get (const char             *basename,
           g_object_unref (info);
           g_set_error (error, G_IO_ERROR,
                       g_io_error_from_errno (errsv),
-                      _("Error when getting information for file '%s': %s"),
+                      _("Error when getting information for file “%s”: %s"),
                       display_name, g_strerror (errsv));
           g_free (display_name);
           return NULL;
diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
index 491d799..65c51d7 100644
--- a/gio/glocalfileoutputstream.c
+++ b/gio/glocalfileoutputstream.c
@@ -552,7 +552,7 @@ set_error_from_open_errno (const char *filename,
       char *display_name = g_filename_display_name (filename);
       g_set_error (error, G_IO_ERROR,
                    g_io_error_from_errno (errsv),
-                   _("Error opening file '%s': %s"),
+                   _("Error opening file “%s”: %s"),
                       display_name, g_strerror (errsv));
       g_free (display_name);
     }
@@ -782,7 +782,7 @@ handle_overwrite_open (const char    *filename,
       char *display_name = g_filename_display_name (filename);
       g_set_error (error, G_IO_ERROR,
                   g_io_error_from_errno (errsv),
-                  _("Error opening file '%s': %s"),
+                  _("Error opening file “%s”: %s"),
                   display_name, g_strerror (errsv));
       g_free (display_name);
       return -1;
@@ -800,7 +800,7 @@ handle_overwrite_open (const char    *filename,
       char *display_name = g_filename_display_name (filename);
       g_set_error (error, G_IO_ERROR,
                   g_io_error_from_errno (errsv),
-                  _("Error when getting information for file '%s': %s"),
+                  _("Error when getting information for file “%s”: %s"),
                   display_name, g_strerror (errsv));
       g_free (display_name);
       goto err_out;
@@ -1032,7 +1032,7 @@ handle_overwrite_open (const char    *filename,
          char *display_name = g_filename_display_name (filename);
          g_set_error (error, G_IO_ERROR,
                       g_io_error_from_errno (errsv),
-                      _("Error opening file '%s': %s"),
+                      _("Error opening file “%s”: %s"),
                       display_name, g_strerror (errsv));
          g_free (display_name);
          goto err_out2;
diff --git a/gio/gmount.c b/gio/gmount.c
index 5deb55b..1758775 100644
--- a/gio/gmount.c
+++ b/gio/gmount.c
@@ -390,7 +390,7 @@ g_mount_unmount (GMount              *mount,
                                /* Translators: This is an error
                                 * message for mount objects that
                                 * don't implement unmount. */
-                               _("mount doesn't implement \"unmount\""));
+                               _("mount doesn’t implement “unmount”"));
       return;
     }
   
@@ -466,7 +466,7 @@ g_mount_eject (GMount              *mount,
                                /* Translators: This is an error
                                 * message for mount objects that
                                 * don't implement eject. */
-                               _("mount doesn't implement \"eject\""));
+                               _("mount doesn’t implement “eject”"));
       return;
     }
   
@@ -544,7 +544,7 @@ g_mount_unmount_with_operation (GMount              *mount,
                                /* Translators: This is an error
                                 * message for mount objects that
                                 * don't implement any of unmount or unmount_with_operation. */
-                               _("mount doesn't implement \"unmount\" or \"unmount_with_operation\""));
+                               _("mount doesn’t implement “unmount” or “unmount_with_operation”"));
       return;
     }
 
@@ -629,7 +629,7 @@ g_mount_eject_with_operation (GMount              *mount,
                                /* Translators: This is an error
                                 * message for mount objects that
                                 * don't implement any of eject or eject_with_operation. */
-                               _("mount doesn't implement \"eject\" or \"eject_with_operation\""));
+                               _("mount doesn’t implement “eject” or “eject_with_operation”"));
       return;
     }
 
@@ -717,7 +717,7 @@ g_mount_remount (GMount              *mount,
                                /* Translators: This is an error
                                 * message for mount objects that
                                 * don't implement remount. */
-                               _("mount doesn't implement \"remount\""));
+                               _("mount doesn’t implement “remount”"));
       return;
     }
   
@@ -799,7 +799,7 @@ g_mount_guess_content_type (GMount              *mount,
                                /* Translators: This is an error
                                 * message for mount objects that
                                 * don't implement content type guessing. */
-                               _("mount doesn't implement content type guessing"));
+                               _("mount doesn’t implement content type guessing"));
       return;
     }
   
@@ -886,7 +886,7 @@ g_mount_guess_content_type_sync (GMount              *mount,
                            /* Translators: This is an error
                             * message for mount objects that
                             * don't implement content type guessing. */
-                           _("mount doesn't implement synchronous content type guessing"));
+                           _("mount doesn’t implement synchronous content type guessing"));
 
       return NULL;
     }
diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c
index 6e01227..ba82164 100644
--- a/gio/gnetworkaddress.c
+++ b/gio/gnetworkaddress.c
@@ -375,7 +375,7 @@ g_network_address_parse (const gchar  *host_and_port,
       if (end == NULL)
         {
           g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-                       _("Hostname '%s' contains '[' but not ']'"), host_and_port);
+                       _("Hostname “%s” contains “[” but not “]”"), host_and_port);
           return NULL;
         }
 
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index db91450..8e8172f 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -209,7 +209,7 @@ g_output_stream_write (GOutputStream  *stream,
   if (class->write_fn == NULL) 
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                           _("Output stream doesn't implement write"));
+                           _("Output stream doesn’t implement write"));
       return -1;
     }
   
@@ -557,7 +557,7 @@ g_output_stream_real_splice (GOutputStream             *stream,
   if (class->write_fn == NULL)
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                           _("Output stream doesn't implement write"));
+                           _("Output stream doesn’t implement write"));
       res = FALSE;
       goto notsupported;
     }
diff --git a/gio/gproxyaddress.c b/gio/gproxyaddress.c
index 0227b9e..0d263fb 100644
--- a/gio/gproxyaddress.c
+++ b/gio/gproxyaddress.c
@@ -272,7 +272,7 @@ g_proxy_address_class_init (GProxyAddressClass *klass)
                                   PROP_URI,
                                   g_param_spec_string ("uri",
                                                        P_("URI"),
-                                                       P_("The proxy's URI"),
+                                                       P_("The proxy’s URI"),
                                                        NULL,
                                                        G_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT_ONLY |
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 56dd5a1..23c6ffd 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -330,7 +330,7 @@ handle_ip_address (const char  *hostname,
 #endif
     {
       g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
-                   _("Error resolving '%s': %s"),
+                   _("Error resolving “%s”: %s"),
                    hostname, gai_strerror (EAI_NONAME));
       return TRUE;
     }
diff --git a/gio/gresource-tool.c b/gio/gresource-tool.c
index 262dd7b..51fabc1 100644
--- a/gio/gresource-tool.c
+++ b/gio/gresource-tool.c
@@ -532,7 +532,7 @@ cmd_help (gboolean     requested,
     {
       g_string_append (string,
       _("Usage:\n"
-        "  gresource [--section SECTION] COMMAND [ARGS...]\n"
+        "  gresource [--section SECTION] COMMAND [ARGS…]\n"
         "\n"
         "Commands:\n"
         "  help                      Show this information\n"
@@ -541,7 +541,7 @@ cmd_help (gboolean     requested,
         "  details                   List resources with details\n"
         "  extract                   Extract a resource\n"
         "\n"
-        "Use 'gresource help COMMAND' to get detailed help.\n\n"));
+        "Use “gresource help COMMAND” to get detailed help.\n\n"));
     }
   else
     {
diff --git a/gio/gresource.c b/gio/gresource.c
index 59c5b40..d613740 100644
--- a/gio/gresource.c
+++ b/gio/gresource.c
@@ -592,7 +592,7 @@ gboolean do_lookup (GResource             *resource,
   if (value == NULL)
     {
       g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                   _("The resource at '%s' does not exist"),
+                   _("The resource at “%s” does not exist"),
                    path);
     }
   else
@@ -757,7 +757,7 @@ g_resource_lookup_data (GResource             *resource,
               g_object_unref (decompressor);
 
               g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_INTERNAL,
-                           _("The resource at '%s' failed to decompress"),
+                           _("The resource at “%s” failed to decompress"),
                            path);
               return NULL;
 
@@ -843,7 +843,7 @@ g_resource_enumerate_children (GResource             *resource,
   if (*path == 0)
     {
       g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                   _("The resource at '%s' does not exist"),
+                   _("The resource at “%s” does not exist"),
                    path);
       return NULL;
     }
@@ -860,7 +860,7 @@ g_resource_enumerate_children (GResource             *resource,
   if (children == NULL)
     {
       g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                   _("The resource at '%s' does not exist"),
+                   _("The resource at “%s” does not exist"),
                    path);
       return NULL;
     }
@@ -984,7 +984,7 @@ g_resources_open_stream (const gchar           *path,
 
   if (l == NULL)
     g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                 _("The resource at '%s' does not exist"),
+                 _("The resource at “%s” does not exist"),
                  path);
 
   g_rw_lock_reader_unlock (&resources_lock);
@@ -1056,7 +1056,7 @@ g_resources_lookup_data (const gchar           *path,
 
   if (l == NULL)
     g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                 _("The resource at '%s' does not exist"),
+                 _("The resource at “%s” does not exist"),
                  path);
 
   g_rw_lock_reader_unlock (&resources_lock);
@@ -1129,7 +1129,7 @@ g_resources_enumerate_children (const gchar           *path,
   if (hash == NULL)
     {
       g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                   _("The resource at '%s' does not exist"),
+                   _("The resource at “%s” does not exist"),
                    path);
       return NULL;
     }
@@ -1199,7 +1199,7 @@ g_resources_get_info (const gchar           *path,
 
   if (l == NULL)
     g_set_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND,
-                 _("The resource at '%s' does not exist"),
+                 _("The resource at “%s” does not exist"),
                  path);
 
   g_rw_lock_reader_unlock (&resources_lock);
diff --git a/gio/gresourcefile.c b/gio/gresourcefile.c
index 6f211f4..fde563f 100644
--- a/gio/gresourcefile.c
+++ b/gio/gresourcefile.c
@@ -450,7 +450,7 @@ g_resource_file_query_info (GFile                *file,
          if (g_error_matches (my_error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND))
            {
              g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
-                          _("The resource at '%s' does not exist"),
+                          _("The resource at “%s” does not exist"),
                           resource->path);
            }
          else
@@ -573,7 +573,7 @@ g_resource_file_read (GFile         *file,
       if (g_error_matches (my_error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND))
        {
          g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
-                      _("The resource at '%s' does not exist"),
+                      _("The resource at “%s” does not exist"),
                       resource->path);
        }
       else
@@ -706,11 +706,11 @@ _g_resource_file_enumerator_new (GResourceFile *file,
       res = g_resources_get_info (file->path, 0, NULL, NULL, NULL);
       if (res)
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_DIRECTORY,
-                    _("The resource at '%s' is not a directory"),
+                    _("The resource at “%s” is not a directory"),
                     file->path);
       else
        g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
-                    _("The resource at '%s' does not exist"),
+                    _("The resource at “%s” does not exist"),
                     file->path);
       return NULL;
     }
@@ -914,7 +914,7 @@ g_resource_file_input_stream_seek (GFileInputStream  *stream,
   if (!G_IS_SEEKABLE (file->stream))
     {
       g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                          _("Input stream doesn't implement seek"));
+                          _("Input stream doesn’t implement seek"));
       return FALSE;
     }
 
diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
index 88f304b..544af84 100644
--- a/gio/gsettings-tool.c
+++ b/gio/gsettings-tool.c
@@ -48,13 +48,13 @@ check_relocatable_schema (GSettingsSchema *schema,
 {
   if (schema == NULL)
     {
-      g_printerr (_("No such schema '%s'\n"), schema_id);
+      g_printerr (_("No such schema “%s”\n"), schema_id);
       return FALSE;
     }
 
   if (!is_relocatable_schema (schema))
     {
-      g_printerr (_("Schema '%s' is not relocatable "
+      g_printerr (_("Schema “%s” is not relocatable "
                     "(path must not be specified)\n"),
                   schema_id);
       return FALSE;
@@ -69,13 +69,13 @@ check_schema (GSettingsSchema *schema,
 {
   if (schema == NULL)
     {
-      g_printerr (_("No such schema '%s'\n"), schema_id);
+      g_printerr (_("No such schema “%s”\n"), schema_id);
       return FALSE;
     }
 
   if (is_relocatable_schema (schema))
     {
-      g_printerr (_("Schema '%s' is relocatable "
+      g_printerr (_("Schema “%s” is relocatable "
                     "(path must be specified)\n"),
                   schema_id);
       return FALSE;
@@ -619,7 +619,7 @@ gsettings_help (gboolean     requested,
       g_string_append (string,
       _("Usage:\n"
         "  gsettings --version\n"
-        "  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
+        "  gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n"
         "\n"
         "Commands:\n"
         "  help                      Show this information\n"
@@ -637,7 +637,7 @@ gsettings_help (gboolean     requested,
         "  writable                  Check if a key is writable\n"
         "  monitor                   Watch for changes\n"
         "\n"
-        "Use 'gsettings help COMMAND' to get detailed help.\n\n"));
+        "Use “gsettings help COMMAND” to get detailed help.\n\n"));
     }
   else
     {
@@ -848,7 +848,7 @@ main (int argc, char **argv)
             {
               if (global_schema == NULL)
                 {
-                  g_printerr (_("No such schema '%s'\n"), parts[0]);
+                  g_printerr (_("No such schema “%s”\n"), parts[0]);
                   return 1;
                 }
             }
@@ -861,7 +861,7 @@ main (int argc, char **argv)
     {
       if (!g_settings_schema_has_key (global_schema, argv[3]))
         {
-          g_printerr (_("No such key '%s'\n"), argv[3]);
+          g_printerr (_("No such key “%s”\n"), argv[3]);
           return 1;
         }
 
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 0a50295..ea1b88c 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -935,7 +935,7 @@ g_settings_class_init (GSettingsClass *class)
    g_object_class_install_property (object_class, PROP_DELAY_APPLY,
      g_param_spec_boolean ("delay-apply",
                            P_("Delay-apply mode"),
-                           P_("Whether this settings object is in 'delay-apply' mode"),
+                           P_("Whether this settings object is in “delay-apply” mode"),
                            FALSE,
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index 2a83665..840051e 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -1107,7 +1107,7 @@ g_socket_client_connect (GSocketClient       *client,
          else
            {
              g_set_error (&last_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                          _("Proxy protocol '%s' is not supported."),
+                          _("Proxy protocol “%s” is not supported."),
                           protocol);
              g_object_unref (connection);
              connection = NULL;
@@ -1558,7 +1558,7 @@ g_socket_client_connected_callback (GObject      *source,
       g_clear_error (&data->last_error);
 
       g_set_error (&data->last_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-          _("Proxy protocol '%s' is not supported."),
+          _("Proxy protocol “%s” is not supported."),
           protocol);
 
       enumerator_next_async (data);
diff --git a/gio/gsocks4aproxy.c b/gio/gsocks4aproxy.c
index 4fcabc8..8fabdd3 100644
--- a/gio/gsocks4aproxy.c
+++ b/gio/gsocks4aproxy.c
@@ -115,7 +115,7 @@ set_connect_msg (guint8      *msg,
   if (addr_len != 4)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_PROXY_FAILED,
-                 _("SOCKSv4 does not support IPv6 address '%s'"),
+                 _("SOCKSv4 does not support IPv6 address “%s”"),
                  ip);
       g_object_unref (addr);
       return -1;
@@ -150,7 +150,7 @@ set_connect_msg (guint8      *msg,
       if (host_len > SOCKS4_MAX_LEN)
        {
          g_set_error (error, G_IO_ERROR, G_IO_ERROR_PROXY_FAILED,
-                      _("Hostname '%s' is too long for SOCKSv4 protocol"),
+                      _("Hostname “%s” is too long for SOCKSv4 protocol"),
                       hostname);
          return -1;
        }
diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c
index 93b9497..dfe45c1 100644
--- a/gio/gsocks5proxy.c
+++ b/gio/gsocks5proxy.c
@@ -283,7 +283,7 @@ set_connect_msg (guint8       *msg,
       if (host_len > SOCKS5_MAX_LEN)
        {
          g_set_error (error, G_IO_ERROR, G_IO_ERROR_PROXY_FAILED,
-                      _("Hostname '%s' is too long for SOCKSv5 protocol"),
+                      _("Hostname “%s” is too long for SOCKSv5 protocol"),
                       hostname);
          return -1;
        }
@@ -383,7 +383,7 @@ parse_connect_reply (const guint8 *data, gint *atype, GError **error)
 
       case SOCKS5_REP_CMD_NOT_SUP:
        g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_FAILED,
-                            _("SOCKSv5 proxy does not support 'connect' command."));
+                            _("SOCKSv5 proxy does not support “connect” command."));
        return FALSE;
        break;
 
diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c
index 0567f1f..c791543 100644
--- a/gio/gsubprocess.c
+++ b/gio/gsubprocess.c
@@ -357,7 +357,7 @@ unix_open_file (const char  *filename,
 
       display_name = g_filename_display_name (filename);
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (saved_errno),
-                   _("Error opening file '%s': %s"), display_name,
+                   _("Error opening file “%s”: %s"), display_name,
                    g_strerror (saved_errno));
       g_free (display_name);
       /* fall through... */
diff --git a/gio/gthemedicon.c b/gio/gthemedicon.c
index 3d72bc2..e1fc74c 100644
--- a/gio/gthemedicon.c
+++ b/gio/gthemedicon.c
@@ -270,7 +270,7 @@ g_themed_icon_class_init (GThemedIconClass *klass)
   g_object_class_install_property (gobject_class, PROP_USE_DEFAULT_FALLBACKS,
                                    g_param_spec_boolean ("use-default-fallbacks",
                                                          P_("use default fallbacks"),
-                                                         P_("Whether to use default fallbacks found by 
shortening the name at '-' characters. Ignores names after the first if multiple names are given."),
+                                                         P_("Whether to use default fallbacks found by 
shortening the name at “-” characters. Ignores names after the first if multiple names are given."),
                                                          FALSE,
                                                          G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | 
G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NICK));
 }
@@ -515,7 +515,7 @@ g_themed_icon_from_tokens (gchar  **tokens,
       g_set_error (error,
                    G_IO_ERROR,
                    G_IO_ERROR_INVALID_ARGUMENT,
-                   _("Can't handle version %d of GThemedIcon encoding"),
+                   _("Can’t handle version %d of GThemedIcon encoding"),
                    version);
       goto out;
     }
diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index b1b46e9..6b3b1f0 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -113,7 +113,7 @@ do_lookup_by_name (GTask         *task,
           g_task_return_new_error (task,
                                    G_RESOLVER_ERROR,
                                    G_RESOLVER_ERROR_NOT_FOUND,
-                                   _("Error resolving '%s': %s"),
+                                   _("Error resolving “%s”: %s"),
                                    hostname,
                                    _("No valid addresses were found"));
         }
@@ -123,7 +123,7 @@ do_lookup_by_name (GTask         *task,
       g_task_return_new_error (task,
                                G_RESOLVER_ERROR,
                                g_resolver_error_from_addrinfo_error (retval),
-                               _("Error resolving '%s': %s"),
+                               _("Error resolving “%s”: %s"),
                                hostname, gai_strerror (retval));
     }
 
@@ -210,7 +210,7 @@ do_lookup_by_address (GTask         *task,
       g_task_return_new_error (task,
                                G_RESOLVER_ERROR,
                                g_resolver_error_from_addrinfo_error (retval),
-                               _("Error reverse-resolving '%s': %s"),
+                               _("Error reverse-resolving “%s”: %s"),
                                phys ? phys : "(unknown)",
                                gai_strerror (retval));
       g_free (phys);
@@ -547,17 +547,17 @@ g_resolver_records_from_res_query (const gchar      *rrname,
       if (len == 0 || herr == HOST_NOT_FOUND || herr == NO_DATA)
         {
           g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
-                       _("No DNS record of the requested type for '%s'"), rrname);
+                       _("No DNS record of the requested type for “%s”"), rrname);
         }
       else if (herr == TRY_AGAIN)
         {
           g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_TEMPORARY_FAILURE,
-                       _("Temporarily unable to resolve '%s'"), rrname);
+                       _("Temporarily unable to resolve “%s”"), rrname);
         }
       else
         {
           g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_INTERNAL,
-                       _("Error resolving '%s'"), rrname);
+                       _("Error resolving “%s”"), rrname);
         }
 
       return NULL;
@@ -627,7 +627,7 @@ g_resolver_records_from_res_query (const gchar      *rrname,
   if (records == NULL)
     {
       g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
-                   _("No DNS record of the requested type for '%s'"), rrname);
+                   _("No DNS record of the requested type for “%s”"), rrname);
 
       return NULL;
     }
@@ -725,17 +725,17 @@ g_resolver_records_from_DnsQuery (const gchar  *rrname,
       if (status == DNS_ERROR_RCODE_NAME_ERROR)
         {
           g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
-                       _("No DNS record of the requested type for '%s'"), rrname);
+                       _("No DNS record of the requested type for “%s”"), rrname);
         }
       else if (status == DNS_ERROR_RCODE_SERVER_FAILURE)
         {
           g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_TEMPORARY_FAILURE,
-                       _("Temporarily unable to resolve '%s'"), rrname);
+                       _("Temporarily unable to resolve “%s”"), rrname);
         }
       else
         {
           g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_INTERNAL,
-                       _("Error resolving '%s'"), rrname);
+                       _("Error resolving “%s”"), rrname);
         }
 
       return NULL;
@@ -775,7 +775,7 @@ g_resolver_records_from_DnsQuery (const gchar  *rrname,
   if (records == NULL)
     {
       g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
-                   _("No DNS record of the requested type for '%s'"), rrname);
+                   _("No DNS record of the requested type for “%s”"), rrname);
 
       return NULL;
     }
diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c
index 59edab3..e75ea2a 100644
--- a/gio/gtlscertificate.c
+++ b/gio/gtlscertificate.c
@@ -146,7 +146,7 @@ g_tls_certificate_class_init (GTlsCertificateClass *class)
   g_object_class_install_property (gobject_class, PROP_PRIVATE_KEY,
                                   g_param_spec_boxed ("private-key",
                                                       P_("Private key"),
-                                                      P_("The DER representation of the certificate's 
private key"),
+                                                      P_("The DER representation of the certificate’s 
private key"),
                                                       G_TYPE_BYTE_ARRAY,
                                                       G_PARAM_WRITABLE |
                                                       G_PARAM_CONSTRUCT_ONLY |
@@ -170,7 +170,7 @@ g_tls_certificate_class_init (GTlsCertificateClass *class)
   g_object_class_install_property (gobject_class, PROP_PRIVATE_KEY_PEM,
                                   g_param_spec_string ("private-key-pem",
                                                        P_("Private key (PEM)"),
-                                                       P_("The PEM representation of the certificate's 
private key"),
+                                                       P_("The PEM representation of the certificate’s 
private key"),
                                                        NULL,
                                                        G_PARAM_WRITABLE |
                                                        G_PARAM_CONSTRUCT_ONLY |
diff --git a/gio/gtlsconnection.c b/gio/gtlsconnection.c
index c0c98f7..c1b644c 100644
--- a/gio/gtlsconnection.c
+++ b/gio/gtlsconnection.c
@@ -206,7 +206,7 @@ g_tls_connection_class_init (GTlsConnectionClass *klass)
   g_object_class_install_property (gobject_class, PROP_CERTIFICATE,
                                   g_param_spec_object ("certificate",
                                                        P_("Certificate"),
-                                                       P_("The connection's certificate"),
+                                                       P_("The connection’s certificate"),
                                                        G_TYPE_TLS_CERTIFICATE,
                                                        G_PARAM_READWRITE |
                                                        G_PARAM_STATIC_STRINGS));
@@ -226,7 +226,7 @@ g_tls_connection_class_init (GTlsConnectionClass *klass)
   g_object_class_install_property (gobject_class, PROP_PEER_CERTIFICATE,
                                   g_param_spec_object ("peer-certificate",
                                                        P_("Peer Certificate"),
-                                                       P_("The connection's peer's certificate"),
+                                                       P_("The connection’s peer’s certificate"),
                                                        G_TYPE_TLS_CERTIFICATE,
                                                        G_PARAM_READABLE |
                                                        G_PARAM_STATIC_STRINGS));
@@ -245,7 +245,7 @@ g_tls_connection_class_init (GTlsConnectionClass *klass)
   g_object_class_install_property (gobject_class, PROP_PEER_CERTIFICATE_ERRORS,
                                   g_param_spec_flags ("peer-certificate-errors",
                                                       P_("Peer Certificate Errors"),
-                                                      P_("Errors found with the peer's certificate"),
+                                                      P_("Errors found with the peer’s certificate"),
                                                       G_TYPE_TLS_CERTIFICATE_FLAGS,
                                                       0,
                                                       G_PARAM_READABLE |
diff --git a/gio/gvolume.c b/gio/gvolume.c
index a14cbc6..5626baa 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.c
@@ -360,7 +360,7 @@ g_volume_mount (GVolume             *volume,
       g_task_report_new_error (volume, callback, user_data,
                                g_volume_mount,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("volume doesn't implement mount"));
+                               _("volume doesn’t implement mount"));
       return;
     }
   
@@ -434,7 +434,7 @@ g_volume_eject (GVolume             *volume,
       g_task_report_new_error (volume, callback, user_data,
                                g_volume_eject_with_operation,
                                G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               _("volume doesn't implement eject"));
+                               _("volume doesn’t implement eject"));
       return;
     }
   
@@ -511,7 +511,7 @@ g_volume_eject_with_operation (GVolume              *volume,
                                /* Translators: This is an error
                                 * message for volume objects that
                                 * don't implement any of eject or eject_with_operation. */
-                               _("volume doesn't implement eject or eject_with_operation"));
+                               _("volume doesn’t implement eject or eject_with_operation"));
       return;
     }
 
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 2fd4ee3..a1cd9b3 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -752,7 +752,7 @@ parse_bookmark_element (GMarkupParseContext  *context,
            */
           g_set_error (error, G_MARKUP_ERROR,
                       G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-                      _("Unexpected attribute '%s' for element '%s'"),
+                      _("Unexpected attribute “%s” for element “%s”"),
                       attr,
                       XBEL_BOOKMARK_ELEMENT);
           return;
@@ -763,7 +763,7 @@ parse_bookmark_element (GMarkupParseContext  *context,
     {
       g_set_error (error, G_MARKUP_ERROR,
                   G_MARKUP_ERROR_INVALID_CONTENT,
-                  _("Attribute '%s' of element '%s' not found"),
+                  _("Attribute “%s” of element “%s” not found"),
                   XBEL_HREF_ATTRIBUTE,
                   XBEL_BOOKMARK_ELEMENT);
       return;
@@ -834,7 +834,7 @@ parse_application_element (GMarkupParseContext  *context,
     {
       g_set_error (error, G_MARKUP_ERROR,
                   G_MARKUP_ERROR_INVALID_CONTENT,
-                  _("Attribute '%s' of element '%s' not found"),
+                  _("Attribute “%s” of element “%s” not found"),
                   BOOKMARK_NAME_ATTRIBUTE,
                   BOOKMARK_APPLICATION_ELEMENT);
       return;
@@ -844,7 +844,7 @@ parse_application_element (GMarkupParseContext  *context,
     {
       g_set_error (error, G_MARKUP_ERROR,
                   G_MARKUP_ERROR_INVALID_CONTENT,
-                  _("Attribute '%s' of element '%s' not found"),
+                  _("Attribute “%s” of element “%s” not found"),
                   BOOKMARK_EXEC_ATTRIBUTE,
                   BOOKMARK_APPLICATION_ELEMENT);
       return;
@@ -951,7 +951,7 @@ parse_icon_element (GMarkupParseContext  *context,
     {
       g_set_error (error, G_MARKUP_ERROR,
                   G_MARKUP_ERROR_INVALID_CONTENT,
-                  _("Attribute '%s' of element '%s' not found"),
+                  _("Attribute “%s” of element “%s” not found"),
                   BOOKMARK_HREF_ATTRIBUTE,
                   BOOKMARK_ICON_ELEMENT);
       return;
@@ -1121,7 +1121,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_INVALID_CONTENT,
-                    _("Unexpected tag '%s', tag '%s' expected"),
+                    _("Unexpected tag “%s”, tag “%s” expected"),
                     element_name, XBEL_ROOT_ELEMENT);
       break;
     case STATE_ROOT:
@@ -1146,7 +1146,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_INVALID_CONTENT,
-                    _("Unexpected tag '%s' inside '%s'"),
+                    _("Unexpected tag “%s” inside “%s”"),
                     element_name,
                     XBEL_ROOT_ELEMENT);
       break;
@@ -1160,7 +1160,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_INVALID_CONTENT,
-                    _("Unexpected tag '%s' inside '%s'"),
+                    _("Unexpected tag “%s” inside “%s”"),
                     element_name,
                     XBEL_BOOKMARK_ELEMENT);
       break;
@@ -1186,7 +1186,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_INVALID_CONTENT,
-                    _("Unexpected tag '%s', tag '%s' expected"),
+                    _("Unexpected tag “%s”, tag “%s” expected"),
                     element_name,
                     XBEL_METADATA_ELEMENT);
       break;
@@ -1228,7 +1228,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-                    _("Unexpected tag '%s' inside '%s'"),
+                    _("Unexpected tag “%s” inside “%s”"),
                     element_name,
                     XBEL_METADATA_ELEMENT);
       break;
@@ -1250,7 +1250,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_INVALID_CONTENT,
-                    _("Unexpected tag '%s', tag '%s' expected"),
+                    _("Unexpected tag “%s”, tag “%s” expected"),
                     element_name,
                     BOOKMARK_APPLICATION_ELEMENT);
       break;
@@ -1260,7 +1260,7 @@ start_element_raw_cb (GMarkupParseContext *context,
       else
         g_set_error (error, G_MARKUP_ERROR,
                     G_MARKUP_ERROR_INVALID_CONTENT,
-                    _("Unexpected tag '%s', tag '%s' expected"),
+                    _("Unexpected tag “%s”, tag “%s” expected"),
                     element_name,
                     BOOKMARK_GROUP_ELEMENT);
       break;
@@ -1955,7 +1955,7 @@ g_bookmark_file_add_item (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_INVALID_URI,
-                  _("A bookmark for URI '%s' already exists"),
+                  _("A bookmark for URI “%s” already exists"),
                   item->uri);
       return;
     }
@@ -2001,7 +2001,7 @@ g_bookmark_file_remove_item (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
@@ -2159,7 +2159,7 @@ g_bookmark_file_get_title (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return NULL;
     }
@@ -2244,7 +2244,7 @@ g_bookmark_file_get_description (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return NULL;
     }
@@ -2324,7 +2324,7 @@ g_bookmark_file_get_mime_type (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return NULL;
     }
@@ -2333,7 +2333,7 @@ g_bookmark_file_get_mime_type (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-                  _("No MIME type defined in the bookmark for URI '%s'"),
+                  _("No MIME type defined in the bookmark for URI “%s”"),
                   uri);
       return NULL;
     }
@@ -2409,7 +2409,7 @@ g_bookmark_file_get_is_private (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
@@ -2418,7 +2418,7 @@ g_bookmark_file_get_is_private (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-                  _("No private flag has been defined in bookmark for URI '%s'"),
+                  _("No private flag has been defined in bookmark for URI “%s”"),
                    uri);
       return FALSE;
     }
@@ -2492,7 +2492,7 @@ g_bookmark_file_get_added (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return (time_t) -1;
     }
@@ -2570,7 +2570,7 @@ g_bookmark_file_get_modified (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return (time_t) -1;
     }
@@ -2649,7 +2649,7 @@ g_bookmark_file_get_visited (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return (time_t) -1;
     }
@@ -2691,7 +2691,7 @@ g_bookmark_file_has_group (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
@@ -2788,7 +2788,7 @@ g_bookmark_file_remove_group (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
@@ -2797,7 +2797,7 @@ g_bookmark_file_remove_group (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                    G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
-                   _("No groups set in bookmark for URI '%s'"),
+                   _("No groups set in bookmark for URI “%s”"),
                    uri);
       return FALSE;
     }
@@ -2908,7 +2908,7 @@ g_bookmark_file_get_groups (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return NULL;
     }
@@ -3098,7 +3098,7 @@ g_bookmark_file_has_application (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
@@ -3174,7 +3174,7 @@ g_bookmark_file_set_app_info (GBookmarkFile  *bookmark,
         {
           g_set_error (error, G_BOOKMARK_FILE_ERROR,
                       G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                      _("No bookmark found for URI '%s'"),
+                      _("No bookmark found for URI “%s”"),
                       uri);
          return FALSE;
        }
@@ -3195,7 +3195,7 @@ g_bookmark_file_set_app_info (GBookmarkFile  *bookmark,
         {
           g_set_error (error, G_BOOKMARK_FILE_ERROR,
                       G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
-                      _("No application with name '%s' registered a bookmark for '%s'"),
+                      _("No application with name “%s” registered a bookmark for “%s”"),
                       name,
                       uri);
           return FALSE;
@@ -3342,7 +3342,7 @@ g_bookmark_file_get_app_info (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
@@ -3352,7 +3352,7 @@ g_bookmark_file_get_app_info (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
-                  _("No application with name '%s' registered a bookmark for '%s'"),
+                  _("No application with name “%s” registered a bookmark for “%s”"),
                   name,
                   uri);
       return FALSE;
@@ -3375,7 +3375,7 @@ g_bookmark_file_get_app_info (GBookmarkFile  *bookmark,
         {
           g_set_error (error, G_BOOKMARK_FILE_ERROR,
                       G_BOOKMARK_FILE_ERROR_INVALID_URI,
-                      _("Failed to expand exec line '%s' with URI '%s'"),
+                      _("Failed to expand exec line “%s” with URI “%s”"),
                     ai->exec, uri);
           g_free (command_line);
 
@@ -3431,7 +3431,7 @@ g_bookmark_file_get_applications (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return NULL;
     }
@@ -3520,7 +3520,7 @@ g_bookmark_file_move_item (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   old_uri);
       return FALSE;
     }
@@ -3636,7 +3636,7 @@ g_bookmark_file_get_icon (GBookmarkFile  *bookmark,
     {
       g_set_error (error, G_BOOKMARK_FILE_ERROR,
                   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
-                  _("No bookmark found for URI '%s'"),
+                  _("No bookmark found for URI “%s”"),
                   uri);
       return FALSE;
     }
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 3deac78..8923371 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -318,11 +318,11 @@ open_converter (const gchar *to_codeset,
        {
          if (errno == EINVAL)
            g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION,
-                        _("Conversion from character set '%s' to '%s' is not supported"),
+                        _("Conversion from character set “%s” to “%s” is not supported"),
                         from_codeset, to_codeset);
          else
            g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
-                        _("Could not open converter from '%s' to '%s'"),
+                        _("Could not open converter from “%s” to “%s”"),
                         from_codeset, to_codeset);
        }
     }
@@ -739,7 +739,7 @@ g_convert_with_fallback (const gchar *str,
                  /* Error converting fallback string - fatal
                   */
                  g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-                              _("Cannot convert fallback '%s' to codeset '%s'"),
+                              _("Cannot convert fallback “%s” to codeset “%s”"),
                               insert_str, to_codeset);
                  have_error = TRUE;
                  break;
@@ -1564,7 +1564,7 @@ g_filename_from_uri (const gchar *uri,
   if (!has_case_prefix (uri, "file:/"))
     {
       g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI,
-                  _("The URI '%s' is not an absolute URI using the \"file\" scheme"),
+                  _("The URI “%s” is not an absolute URI using the “file” scheme"),
                   uri);
       return NULL;
     }
@@ -1574,7 +1574,7 @@ g_filename_from_uri (const gchar *uri,
   if (strchr (path_part, '#') != NULL)
     {
       g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI,
-                  _("The local file URI '%s' may not include a '#'"),
+                  _("The local file URI “%s” may not include a “#”"),
                   uri);
       return NULL;
     }
@@ -1591,7 +1591,7 @@ g_filename_from_uri (const gchar *uri,
       if (path_part == NULL)
        {
          g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI,
-                      _("The URI '%s' is invalid"),
+                      _("The URI “%s” is invalid"),
                       uri);
          return NULL;
        }
@@ -1603,7 +1603,7 @@ g_filename_from_uri (const gchar *uri,
        {
          g_free (unescaped_hostname);
          g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI,
-                      _("The hostname of the URI '%s' is invalid"),
+                      _("The hostname of the URI “%s” is invalid"),
                       uri);
          return NULL;
        }
@@ -1619,7 +1619,7 @@ g_filename_from_uri (const gchar *uri,
   if (filename == NULL)
     {
       g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_BAD_URI,
-                  _("The URI '%s' contains invalidly escaped characters"),
+                  _("The URI “%s” contains invalidly escaped characters"),
                   uri);
       return NULL;
     }
@@ -1714,7 +1714,7 @@ g_filename_to_uri (const gchar *filename,
   if (!g_path_is_absolute (filename))
     {
       g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH,
-                  _("The pathname '%s' is not an absolute path"),
+                  _("The pathname “%s” is not an absolute path"),
                   filename);
       return NULL;
     }
diff --git a/glib/gdir.c b/glib/gdir.c
index 208a92c..3f5b845 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -152,7 +152,7 @@ g_dir_open (const gchar  *path,
       utf8_path = g_filename_to_utf8 (path, -1, NULL, NULL, NULL);
 
       g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno),
-                   _("Error opening directory '%s': %s"), utf8_path, g_strerror (saved_errno));
+                   _("Error opening directory “%s”: %s"), utf8_path, g_strerror (saved_errno));
       g_free (utf8_path);
     }
 
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 177f4f7..99cc72b 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -698,7 +698,7 @@ get_contents_stdio (const gchar  *filename,
               g_set_error (error,
                            G_FILE_ERROR,
                            G_FILE_ERROR_NOMEM,
-                           g_dngettext (GETTEXT_PACKAGE, "Could not allocate %lu byte to read file \"%s\"", 
"Could not allocate %lu bytes to read file \"%s\"", (gulong)total_allocated),
+                           g_dngettext (GETTEXT_PACKAGE, "Could not allocate %lu byte to read file “%s”", 
"Could not allocate %lu bytes to read file “%s”", (gulong)total_allocated),
                            (gulong) total_allocated,
                           display_filename);
               g_free (display_filename);
@@ -715,7 +715,7 @@ get_contents_stdio (const gchar  *filename,
           g_set_error (error,
                        G_FILE_ERROR,
                        g_file_error_from_errno (save_errno),
-                       _("Error reading file '%s': %s"),
+                       _("Error reading file “%s”: %s"),
                        display_filename,
                       g_strerror (save_errno));
           g_free (display_filename);
@@ -751,7 +751,7 @@ get_contents_stdio (const gchar  *filename,
   g_set_error (error,
                G_FILE_ERROR,
                G_FILE_ERROR_FAILED,
-               _("File \"%s\" is too large"),
+               _("File “%s” is too large"),
                display_filename);
   g_free (display_filename);
 
@@ -790,7 +790,7 @@ get_contents_regfile (const gchar  *filename,
       g_set_error (error,
                    G_FILE_ERROR,
                    G_FILE_ERROR_NOMEM,
-                           g_dngettext (GETTEXT_PACKAGE, "Could not allocate %lu byte to read file \"%s\"", 
"Could not allocate %lu bytes to read file \"%s\"", (gulong)alloc_size),
+                           g_dngettext (GETTEXT_PACKAGE, "Could not allocate %lu byte to read file “%s”", 
"Could not allocate %lu bytes to read file “%s”", (gulong)alloc_size),
                    (gulong) alloc_size, 
                   display_filename);
       g_free (display_filename);
@@ -815,7 +815,7 @@ get_contents_regfile (const gchar  *filename,
               g_set_error (error,
                            G_FILE_ERROR,
                            g_file_error_from_errno (save_errno),
-                           _("Failed to read from file '%s': %s"),
+                           _("Failed to read from file “%s”: %s"),
                            display_filename, 
                           g_strerror (save_errno));
               g_free (display_filename);
@@ -863,7 +863,7 @@ get_contents_posix (const gchar  *filename,
       int saved_errno = errno;
       set_file_error (error,
                       filename,
-                      _("Failed to open file '%s': %s"),
+                      _("Failed to open file “%s”: %s"),
                       saved_errno);
 
       return FALSE;
@@ -875,7 +875,7 @@ get_contents_posix (const gchar  *filename,
       int saved_errno = errno;
       set_file_error (error,
                       filename,
-                      _("Failed to get attributes of file '%s': fstat() failed: %s"),
+                      _("Failed to get attributes of file “%s”: fstat() failed: %s"),
                       saved_errno);
       close (fd);
 
@@ -905,7 +905,7 @@ get_contents_posix (const gchar  *filename,
           int saved_errno = errno;
           set_file_error (error,
                           filename,
-                          _("Failed to open file '%s': fdopen() failed: %s"),
+                          _("Failed to open file “%s”: fdopen() failed: %s"),
                           saved_errno);
 
           return FALSE;
@@ -935,7 +935,7 @@ get_contents_win32 (const gchar  *filename,
       int saved_errno = errno;
       set_file_error (error,
                       filename,
-                      _("Failed to open file '%s': %s"),
+                      _("Failed to open file “%s”: %s"),
                       saved_errno);
 
       return FALSE;
@@ -1004,7 +1004,7 @@ rename_file (const char  *old_name,
       g_set_error (err,
                   G_FILE_ERROR,
                   g_file_error_from_errno (save_errno),
-                  _("Failed to rename file '%s' to '%s': g_rename() failed: %s"),
+                  _("Failed to rename file “%s” to “%s”: g_rename() failed: %s"),
                   display_old_name,
                   display_new_name,
                   g_strerror (save_errno));
@@ -1039,7 +1039,7 @@ write_to_temp_file (const gchar  *contents,
     {
       int saved_errno = errno;
       set_file_error (err,
-                      tmp_name, _("Failed to create file '%s': %s"),
+                      tmp_name, _("Failed to create file “%s”: %s"),
                       saved_errno);
       goto out;
     }
@@ -1066,7 +1066,7 @@ write_to_temp_file (const gchar  *contents,
             continue;
 
           set_file_error (err,
-                          tmp_name, _("Failed to write file '%s': write() failed: %s"),
+                          tmp_name, _("Failed to write file “%s”: write() failed: %s"),
                           saved_errno);
           close (fd);
           g_unlink (tmp_name);
@@ -1109,7 +1109,7 @@ write_to_temp_file (const gchar  *contents,
       {
         int saved_errno = errno;
         set_file_error (err,
-                        tmp_name, _("Failed to write file '%s': fsync() failed: %s"),
+                        tmp_name, _("Failed to write file “%s”: fsync() failed: %s"),
                         saved_errno);
         close (fd);
         g_unlink (tmp_name);
@@ -1233,7 +1233,7 @@ g_file_set_contents (const gchar  *filename,
           int saved_errno = errno;
           set_file_error (error,
                           filename,
-                         _("Existing file '%s' could not be removed: g_unlink() failed: %s"),
+                         _("Existing file “%s” could not be removed: g_unlink() failed: %s"),
                           saved_errno);
          g_unlink (tmp_filename);
          retval = FALSE;
@@ -1504,7 +1504,7 @@ g_get_tmp_name (const gchar      *tmpl,
       g_set_error (error,
                    G_FILE_ERROR,
                    G_FILE_ERROR_FAILED,
-                   _("Template '%s' invalid, should not contain a '%s'"),
+                   _("Template “%s” invalid, should not contain a “%s”"),
                    display_tmpl, c);
       g_free (display_tmpl);
 
@@ -1517,7 +1517,7 @@ g_get_tmp_name (const gchar      *tmpl,
       g_set_error (error,
                    G_FILE_ERROR,
                    G_FILE_ERROR_FAILED,
-                   _("Template '%s' doesn't contain XXXXXX"),
+                   _("Template “%s” doesn’t contain XXXXXX"),
                    display_tmpl);
       g_free (display_tmpl);
       return -1;
@@ -1538,7 +1538,7 @@ g_get_tmp_name (const gchar      *tmpl,
       int saved_errno = errno;
       set_file_error (error,
                       fulltemplate,
-                      _("Failed to create file '%s': %s"),
+                      _("Failed to create file “%s”: %s"),
                       saved_errno);
       g_free (fulltemplate);
       return -1;
@@ -2042,7 +2042,7 @@ g_file_read_link (const gchar  *filename,
           int saved_errno = errno;
           set_file_error (error,
                           filename,
-                          _("Failed to read the symbolic link '%s': %s"),
+                          _("Failed to read the symbolic link “%s”: %s"),
                           saved_errno);
           g_free (buffer);
           return NULL;
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 8e9d222..37110af 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -1381,11 +1381,11 @@ g_io_channel_set_encoding (GIOChannel   *channel,
 
           if (err == EINVAL)
             g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_NO_CONVERSION,
-                         _("Conversion from character set '%s' to '%s' is not supported"),
+                         _("Conversion from character set “%s” to “%s” is not supported"),
                          from_enc, to_enc);
           else
             g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
-                         _("Could not open converter from '%s' to '%s': %s"),
+                         _("Could not open converter from “%s” to “%s”: %s"),
                          from_enc, to_enc, g_strerror (err));
 
           if (read_cd != (GIConv) -1)
@@ -1730,7 +1730,7 @@ g_io_channel_read_line_backend (GIOChannel  *channel,
     {
       /* Can't do a raw read in read_line */
       g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
-                           _("Can't do a raw read in g_io_channel_read_line_string"));
+                           _("Can’t do a raw read in g_io_channel_read_line_string"));
       return G_IO_STATUS_ERROR;
     }
 
@@ -1921,7 +1921,7 @@ g_io_channel_read_to_end (GIOChannel  *channel,
   if (!channel->use_buffer)
     {
       g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
-                           _("Can't do a raw read in g_io_channel_read_to_end"));
+                           _("Can’t do a raw read in g_io_channel_read_to_end"));
       return G_IO_STATUS_ERROR;
     }
 
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 7fb4d7f..4c444ab 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -1201,7 +1201,7 @@ g_key_file_parse_line (GKeyFile     *key_file,
       gchar *line_utf8 = _g_utf8_make_valid (line);
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_PARSE,
-                   _("Key file contains line '%s' which is not "
+                   _("Key file contains line “%s” which is not "
                      "a key-value pair, group, or comment"),
                    line_utf8);
       g_free (line_utf8);
@@ -1334,7 +1334,7 @@ g_key_file_parse_key_value_pair (GKeyFile     *key_file,
           g_set_error (error, G_KEY_FILE_ERROR,
                        G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
                        _("Key file contains unsupported "
-                        "encoding '%s'"), value_utf8);
+                        "encoding “%s”"), value_utf8);
          g_free (value_utf8);
 
           g_free (key);
@@ -1576,7 +1576,7 @@ g_key_file_get_keys (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name);
       return NULL;
     }
@@ -1704,7 +1704,7 @@ set_not_found_key_error (const char *group_name,
 {
   g_set_error (error, G_KEY_FILE_ERROR,
                G_KEY_FILE_ERROR_KEY_NOT_FOUND,
-               _("Key file does not have key '%s' in group '%s'"),
+               _("Key file does not have key “%s” in group “%s”"),
                key, group_name);
 }
 
@@ -1749,7 +1749,7 @@ g_key_file_get_value (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name);
       return NULL;
     }
@@ -1866,7 +1866,7 @@ g_key_file_get_string (GKeyFile     *key_file,
       gchar *value_utf8 = _g_utf8_make_valid (value);
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
-                   _("Key file contains key '%s' with value '%s' "
+                   _("Key file contains key “%s” with value “%s” "
                      "which is not UTF-8"), key, value_utf8);
       g_free (value_utf8);
       g_free (value);
@@ -1886,7 +1886,7 @@ g_key_file_get_string (GKeyFile     *key_file,
         {
           g_set_error (error, G_KEY_FILE_ERROR,
                        G_KEY_FILE_ERROR_INVALID_VALUE,
-                       _("Key file contains key '%s' "
+                       _("Key file contains key “%s” "
                          "which has a value that cannot be interpreted."),
                        key);
           g_error_free (key_file_error);
@@ -1982,7 +1982,7 @@ g_key_file_get_string_list (GKeyFile     *key_file,
       gchar *value_utf8 = _g_utf8_make_valid (value);
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
-                   _("Key file contains key '%s' with value '%s' "
+                   _("Key file contains key “%s” with value “%s” "
                      "which is not UTF-8"), key, value_utf8);
       g_free (value_utf8);
       g_free (value);
@@ -2002,7 +2002,7 @@ g_key_file_get_string_list (GKeyFile     *key_file,
         {
           g_set_error (error, G_KEY_FILE_ERROR,
                        G_KEY_FILE_ERROR_INVALID_VALUE,
-                       _("Key file contains key '%s' "
+                       _("Key file contains key “%s” "
                          "which has a value that cannot be interpreted."),
                        key);
           g_error_free (key_file_error);
@@ -2371,7 +2371,7 @@ g_key_file_get_boolean (GKeyFile     *key_file,
         {
           g_set_error (error, G_KEY_FILE_ERROR,
                        G_KEY_FILE_ERROR_INVALID_VALUE,
-                       _("Key file contains key '%s' "
+                       _("Key file contains key “%s” "
                          "which has a value that cannot be interpreted."),
                        key);
           g_error_free (key_file_error);
@@ -2588,7 +2588,7 @@ g_key_file_get_integer (GKeyFile     *key_file,
         {
           g_set_error (error, G_KEY_FILE_ERROR,
                        G_KEY_FILE_ERROR_INVALID_VALUE,
-                       _("Key file contains key '%s' in group '%s' "
+                       _("Key file contains key “%s” in group “%s” "
                          "which has a value that cannot be interpreted."),
                          key, group_name);
           g_error_free (key_file_error);
@@ -2666,7 +2666,7 @@ g_key_file_get_int64 (GKeyFile     *key_file,
   if (*s == '\0' || *end != '\0')
     {
       g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
-                   _("Key '%s' in group '%s' has value '%s' "
+                   _("Key “%s” in group “%s” has value “%s” "
                      "where %s was expected"),
                    key, group_name, s, "int64");
       g_free (s);
@@ -2743,7 +2743,7 @@ g_key_file_get_uint64 (GKeyFile     *key_file,
   if (*s == '\0' || *end != '\0')
     {
       g_set_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_INVALID_VALUE,
-                   _("Key '%s' in group '%s' has value '%s' "
+                   _("Key “%s” in group “%s” has value “%s” "
                      "where %s was expected"),
                    key, group_name, s, "uint64");
       g_free (s);
@@ -2956,7 +2956,7 @@ g_key_file_get_double  (GKeyFile     *key_file,
         {
           g_set_error (error, G_KEY_FILE_ERROR,
                        G_KEY_FILE_ERROR_INVALID_VALUE,
-                       _("Key file contains key '%s' in group '%s' "
+                       _("Key file contains key “%s” in group “%s” "
                          "which has a value that cannot be interpreted."),
                        key, group_name);
           g_error_free (key_file_error);
@@ -3127,7 +3127,7 @@ g_key_file_set_key_comment (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name ? group_name : "(null)");
 
       return FALSE;
@@ -3190,7 +3190,7 @@ g_key_file_set_group_comment (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name ? group_name : "(null)");
 
       return FALSE;
@@ -3320,7 +3320,7 @@ g_key_file_get_key_comment (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name ? group_name : "(null)");
 
       return NULL;
@@ -3450,7 +3450,7 @@ g_key_file_get_group_comment (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name ? group_name : "(null)");
 
       return NULL;
@@ -3594,7 +3594,7 @@ g_key_file_has_key_full (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name);
 
       return FALSE;
@@ -3823,7 +3823,7 @@ g_key_file_remove_group (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                   G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                  _("Key file does not have group '%s'"),
+                  _("Key file does not have group “%s”"),
                   group_name);
       return FALSE;
     }
@@ -3890,7 +3890,7 @@ g_key_file_remove_key (GKeyFile     *key_file,
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
-                   _("Key file does not have group '%s'"),
+                   _("Key file does not have group “%s”"),
                    group_name);
       return FALSE;
     }
@@ -4153,7 +4153,7 @@ g_key_file_parse_value_as_string (GKeyFile     *key_file,
                      g_set_error (error, G_KEY_FILE_ERROR,
                                   G_KEY_FILE_ERROR_INVALID_VALUE,
                                   _("Key file contains invalid escape "
-                                    "sequence '%s'"), sequence);
+                                    "sequence “%s”"), sequence);
                    }
                }
               break;
@@ -4294,7 +4294,7 @@ g_key_file_parse_value_as_integer (GKeyFile     *key_file,
       gchar *value_utf8 = _g_utf8_make_valid (value);
       g_set_error (error, G_KEY_FILE_ERROR,
                   G_KEY_FILE_ERROR_INVALID_VALUE,
-                  _("Value '%s' cannot be interpreted "
+                  _("Value “%s” cannot be interpreted "
                     "as a number."), value_utf8);
       g_free (value_utf8);
 
@@ -4308,7 +4308,7 @@ g_key_file_parse_value_as_integer (GKeyFile     *key_file,
       g_set_error (error,
                   G_KEY_FILE_ERROR, 
                   G_KEY_FILE_ERROR_INVALID_VALUE,
-                  _("Integer value '%s' out of range"), 
+                  _("Integer value “%s” out of range"), 
                   value_utf8);
       g_free (value_utf8);
 
@@ -4341,7 +4341,7 @@ g_key_file_parse_value_as_double  (GKeyFile     *key_file,
       gchar *value_utf8 = _g_utf8_make_valid (value);
       g_set_error (error, G_KEY_FILE_ERROR,
                   G_KEY_FILE_ERROR_INVALID_VALUE,
-                  _("Value '%s' cannot be interpreted "
+                  _("Value “%s” cannot be interpreted "
                     "as a float number."), 
                   value_utf8);
       g_free (value_utf8);
@@ -4380,7 +4380,7 @@ g_key_file_parse_value_as_boolean (GKeyFile     *key_file,
   value_utf8 = _g_utf8_make_valid (value);
   g_set_error (error, G_KEY_FILE_ERROR,
                G_KEY_FILE_ERROR_INVALID_VALUE,
-               _("Value '%s' cannot be interpreted "
+               _("Value “%s” cannot be interpreted "
                 "as a boolean."), value_utf8);
   g_free (value_utf8);
 
diff --git a/glib/gmappedfile.c b/glib/gmappedfile.c
index 9886cce..bc23a6d 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.c
@@ -126,7 +126,7 @@ mapped_file_new_from_fd (int           fd,
       g_set_error (error,
                    G_FILE_ERROR,
                    g_file_error_from_errno (save_errno),
-                   _("Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"),
+                   _("Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"),
                   display_filename ? display_filename : "fd",
                   display_filename ? "' " : "",
                   display_filename ? display_filename : "",
@@ -259,7 +259,7 @@ g_mapped_file_new (const gchar  *filename,
       g_set_error (error,
                    G_FILE_ERROR,
                    g_file_error_from_errno (save_errno),
-                   _("Failed to open file '%s': open() failed: %s"),
+                   _("Failed to open file “%s”: open() failed: %s"),
                    display_filename,
                   g_strerror (save_errno));
       g_free (display_filename);
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 7103d48..834eb9e 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 "
-                                        "(&#234; for example) - perhaps "
+                                        "(&#234; 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 &amp;"));
+                                        "an entity — escape ampersand as &amp;"));
                   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: &amp; &quot; &lt; &gt; &apos;"));
               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 &amp;"));
+                                          "an entity — escape ampersand as &amp;"));
                 }
               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 '</'; '%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));
@@ -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:
diff --git a/glib/goption.c b/glib/goption.c
index 3afdc96..19ff541 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -858,7 +858,7 @@ g_option_context_get_help (GOptionContext *context,
   if (context->help_enabled ||
       (context->main_group && context->main_group->n_entries > 0) ||
       context->groups != NULL)
-    g_string_append_printf (string, " %s", _("[OPTION...]"));
+    g_string_append_printf (string, " %s", _("[OPTION…]"));
 
   if (rest_description)
     {
@@ -1110,7 +1110,7 @@ parse_int (const gchar *arg_name,
     {
       g_set_error (error,
                    G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-                   _("Cannot parse integer value '%s' for %s"),
+                   _("Cannot parse integer value “%s” for %s"),
                    arg, arg_name);
       return FALSE;
     }
@@ -1120,7 +1120,7 @@ parse_int (const gchar *arg_name,
     {
       g_set_error (error,
                    G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-                   _("Integer value '%s' for %s out of range"),
+                   _("Integer value “%s” for %s out of range"),
                    arg, arg_name);
       return FALSE;
     }
@@ -1145,7 +1145,7 @@ parse_double (const gchar *arg_name,
     {
       g_set_error (error,
                    G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-                   _("Cannot parse double value '%s' for %s"),
+                   _("Cannot parse double value “%s” for %s"),
                    arg, arg_name);
       return FALSE;
     }
@@ -1153,7 +1153,7 @@ parse_double (const gchar *arg_name,
     {
       g_set_error (error,
                    G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-                   _("Double value '%s' for %s out of range"),
+                   _("Double value “%s” for %s out of range"),
                    arg, arg_name);
       return FALSE;
     }
@@ -1180,7 +1180,7 @@ parse_int64 (const gchar *arg_name,
     {
       g_set_error (error,
                    G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-                   _("Cannot parse integer value '%s' for %s"),
+                   _("Cannot parse integer value “%s” for %s"),
                    arg, arg_name);
       return FALSE;
     }
@@ -1188,7 +1188,7 @@ parse_int64 (const gchar *arg_name,
     {
       g_set_error (error,
                    G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
-                   _("Integer value '%s' for %s out of range"),
+                   _("Integer value “%s” for %s out of range"),
                    arg, arg_name);
       return FALSE;
     }
diff --git a/glib/gregex.c b/glib/gregex.c
index 0cfe639..b68ee95 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -2410,7 +2410,7 @@ expand_escape (const gchar        *replacement,
               h = g_ascii_xdigit_value (*p);
               if (h < 0)
                 {
-                  error_detail = _("hexadecimal digit or '}' expected");
+                  error_detail = _("hexadecimal digit or “}” expected");
                   goto error;
                 }
               x = x * 16 + h;
@@ -2466,7 +2466,7 @@ expand_escape (const gchar        *replacement,
       p++;
       if (*p != '<')
         {
-          error_detail = _("missing '<' in symbolic reference");
+          error_detail = _("missing “<” in symbolic reference");
           goto error;
         }
       q = p + 1;
@@ -2573,7 +2573,7 @@ expand_escape (const gchar        *replacement,
         }
       break;
     case 0:
-      error_detail = _("stray final '\\'");
+      error_detail = _("stray final “\\”");
       goto error;
       break;
     default:
@@ -2588,7 +2588,7 @@ expand_escape (const gchar        *replacement,
   tmp_error = g_error_new (G_REGEX_ERROR,
                            G_REGEX_ERROR_REPLACE,
                            _("Error while parsing replacement "
-                             "text \"%s\" at char %lu: %s"),
+                             "text “%s” at char %lu: %s"),
                            replacement,
                            (gulong)(p - replacement),
                            error_detail);
diff --git a/glib/gshell.c b/glib/gshell.c
index 2c50af8..5fb6a80 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -93,7 +93,7 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err)
       g_set_error_literal (err,
                            G_SHELL_ERROR,
                            G_SHELL_ERROR_BAD_QUOTING,
-                           _("Quoted text doesn't begin with a quotation mark"));
+                           _("Quoted text doesn’t begin with a quotation mark"));
       *end = str;
       return FALSE;
     }
@@ -579,15 +579,15 @@ tokenize_command_line (const gchar *command_line,
         g_set_error (error,
                      G_SHELL_ERROR,
                      G_SHELL_ERROR_BAD_QUOTING,
-                     _("Text ended just after a '\\' character."
-                       " (The text was '%s')"),
+                     _("Text ended just after a “\\” character."
+                       " (The text was “%s”)"),
                      command_line);
       else
         g_set_error (error,
                      G_SHELL_ERROR,
                      G_SHELL_ERROR_BAD_QUOTING,
                      _("Text ended before matching quote was found for %c."
-                       " (The text was '%s')"),
+                       " (The text was “%s”)"),
                      current_quote, command_line);
       
       goto error;
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index d98aba1..da2a637 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -367,7 +367,7 @@ set_child_error (gintptr      report[2],
     {
     case CHILD_CHDIR_FAILED:
       g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_CHDIR,
-                  _("Failed to change to directory '%s' (%s)"),
+                  _("Failed to change to directory “%s” (%s)"),
                   working_directory,
                   g_strerror (report[1]));
       break;
diff --git a/glib/gspawn.c b/glib/gspawn.c
index bf0a268..6ef705d 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -1487,7 +1487,7 @@ fork_exec_with_pipes (gboolean              intermediate_child,
               g_set_error (error,
                            G_SPAWN_ERROR,
                            G_SPAWN_ERROR_CHDIR,
-                           _("Failed to change to directory '%s' (%s)"),
+                           _("Failed to change to directory “%s” (%s)"),
                            working_directory,
                            g_strerror (buf[1]));
 
@@ -1497,7 +1497,7 @@ fork_exec_with_pipes (gboolean              intermediate_child,
               g_set_error (error,
                            G_SPAWN_ERROR,
                            exec_err_to_g_error (buf[1]),
-                           _("Failed to execute child process \"%s\" (%s)"),
+                           _("Failed to execute child process “%s” (%s)"),
                            argv[0],
                            g_strerror (buf[1]));
 
@@ -1524,7 +1524,7 @@ fork_exec_with_pipes (gboolean              intermediate_child,
               g_set_error (error,
                            G_SPAWN_ERROR,
                            G_SPAWN_ERROR_FAILED,
-                           _("Unknown error executing child process \"%s\""),
+                           _("Unknown error executing child process “%s”"),
                            argv[0]);
               break;
             }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]